// follow up 2bdd9f1f910cc148c86a43fb08879404f0acf480
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6