// Fix manufacturer address export
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release