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