Merge remote-tracking branch 'origin/master-3.0' into master-3.0