Merge remote-tracking branch 'ourfork/osgi-module' into osgi-module