Merge branch 'stable' into upstream-master

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

    Code
    1. Merge branch 'stable' into upstream-master
    3. Conflicts:
    4. CHANGELOG
    5. configs/debian/imscp.conf
    6. configs/ubuntu/imscp.conf

    [/feedquote]