Merge remote-tracking branch 'oxid/b-dev-ce' into composer