Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
// English
Merge pull request #906 from djfm/development

// Small fix