[+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6