Merge branch osgiR8 into master