// correct query
Merge branch '1.6' of github.com:PrestaShop/Prestashop into 1.6