//fixed #PSCSX-166
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
//fixed #PSCSX-166 part 2