[-] FO : Fix #PSCSX-2405 change when shipping need multi-shipper
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6