Merge branch 'master' of https://github.com/2686747/osgi-cartridge