// #PSCSX-1463 w3c
// #PSCSX-1463 w3c
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6