Merge pull request #2 from PrestaShop/master

Update from master