[-] BO : fixed bug when carrier is free and change shipping method
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release