Merge branch 'master' of ssh://git.eclipse.org:29418/stem/org.eclipse.stem into stochastic_fix