// fix bug from https://github.com/PrestaShop/PrestaShop/commit/72277db507c62f7747a4ac31300724cb541dde15
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6