// Fix sql query
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// fix display of accessories for products without combinations