Merge branch 'master' of ssh://sdubois@git.eclipse.org/gitroot/www.eclipse.org/r4e.git