[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/653 thanks @kpodemski