Merge branch 'master' of https://git.eclipse.org/r/www.eclipse.org/gendoc

# Conflicts:
#	downloads/download.php
#	roadmap/roadmap.php