Merge branch 'master' into osgiR8