// samml fix
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6