Merge branch 'master' of ssh://git.eclipse.org:29418/gmf-tooling/org.eclipse.gmf-tooling