Merge branch 'master' of ssh://git.eclipse.org:29418/www.eclipse.org/osbp