Merge branch 'stable' into upstream-master

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

    Code
    1. Merge branch 'stable' into upstream-master
    3. Conflicts:
    4. CHANGELOG

    [/feedquote]