// FO: Attachements
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// fix attachment upload
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6