// folow up https://github.com/PrestaShop/PrestaShop/commit/36ad8c9944633cb0862b5e9684c1788f48074d60#commitcomment-5324341
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6