[-] Fo : Fix bug #PSCSX-1111
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release