// follow up 93fc1902631c864c69251fd0d30aeba29a11ce59
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6