Merge branch 'master' of git://git.eclipse.org/gitroot/gmf-tooling/org.eclipse.gmf-tooling into 386838-templates-xtend2