Merge branch 'master' of ssh://git.eclipse.org/gitroot/www.eclipse.org/users.git Conflicts: index.php