Merge remote-tracking branch 'OE-2.1/master' into vuplus-3.0