Merge branch 'master' of ssh://rhille@git.eclipse.org/gitroot/bpmn2