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