// follow up 1f10e25bfbbb299f5c6400c719b38c69a56ca6c4
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6