// revert from https://github.com/PrestaShop/PrestaShop/commit/ff475ec9e3ae2c6a99b1a0ce90a080ff396b11e5
// revert from https://github.com/PrestaShop/PrestaShop/commit/bc81eaf1d5fbb1f6e1fcf5c9524115599672a13c
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6