Merged with prestashop's version