// follow up PSCFV-12472
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : Fix bug #PSCFV-12472 do not use PS_PRODUCT_PICTURE_MAX_SIZE for product image upload
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6