Merge branch 'master' of ssh://azoitl@git.eclipse.org:29418/www.eclipse.org/4diac.git