// small fix
Merge branch 'release' of github.com:PrestaShop/PrestaShop into release