// Removed line from merge
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development