[-] BO : fixed bug #PSCSX-799
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release