// follow up 21942a464b630b95d8e3a0241751d9711841f81d
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6