// revert from https://github.com/PrestaShop/PrestaShop/commit/17a2c6c2199cfbc9093028367a0450b0af2ab11f
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6