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