// follow up #PSCSX-3095, Fatal error while importing
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6