Merge branch 'master' of ssh://khussey@git.eclipse.org:29418/uml2/org.eclipse.uml2