Merge branch 'master' of https://sedlund@git.eclipse.org/r/stem/org.eclipse.stem.git