Added changes from eb94b51 TMMeilleur/PrestaShop