//fixed bug #PSCSX-2087
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release