// bad commit 1ebd4c3f96d2fdc961b99850894361a0d13d4055
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6