// follow up https://github.com/PrestaShop/PrestaShop/commit/7140a63272fa2de5f7368a062d7fde79ca89d692#commitcomment-4775950
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6