//fixed multi-shipping bug
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release