Merged with prestashop's branch