Merge branch 'sherrmann/osgi.WeavingHook'