Merge branch 'master' of ssh://sedlund@git.eclipse.org:29418/stem/org.eclipse.stem.git