// follow up 55c562c88730c5577fd8c7063eb61663cd496f2b
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6