Merge branch 'master' into master-pluginonly