Merge branch 'upstream-master' into stable

    [feedquote='i-MSCP Github (nuxwin)','https://github.com/i-MSCP/imscp/commit/93b01d8d6a832003e516f14616f68dd2a529a4c8']

    Code
    1. Merge branch 'upstream-master' into stable
    3. Conflicts:
    4. CHANGELOG
    5. configs/debian/apache/parts/domain.tpl

    [/feedquote]