// follow up #1852
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6