Merge branch 'plugin-interface' into master