// port #2186
Merge branch 'release' of github.com:PrestaShop/Prestashop into release