Merge pull request #1 from PrestaShop/master

update