Merge branch 'master' of ssh://hvoormann@git.eclipse.org/gitroot/www.eclipse.org/vex.git