// follow up 0e15ddb11230f15b1d56c2078f37232675402b00
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6