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