Alliance : PR merged
Merge branch 'tpharaoh-master'
Merge branch 'master' of github.com:PrestaShop/PrestaShop-modules