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