Fixes after merging from main repository

Conflicts:

	lib/mshoplib/src/MShop/Coupon/Provider/FixedRebate.php