[-] FO : Fix #PSCSX-4090
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6