//small fix #PSCFV-11505
Merge branch 'master' of https://github.com/PrestaShop/PrestaShop-1.5