[-] BO : FixBug #PSCSX-3570 - Fix tax calculation with free shipping
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6