[-] CORE : Follow up #PSCSX-2500
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6