Happy New Year PrestaShop!
Merge pull request #1241 from PhpMadman/patch-2

Happy New Year PrestaShop!