Merge branch 'dev-product-variants' of dev.quiqqer.com:quiqqer/products into dev-product-variants