Merge branch 'master' into undo-osgi-changes