Fixed some metadata.
Merge branch 'master' into osgi-refactoring