// follow up #PSCSX-3357

Apply https://code.google.com/p/smarty-php/source/detail?r=4897
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6