//small upgrade fix
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6