Merge commit 'ee3d5d64b8f5f091433b62383f349ac95647dd3a' into upstream

Conflicts:
	web/html/actions/updates.php
	web/html/contact.html
	web/html/documentation.html
	web/html/download.html
	web/html/features.html
	web/html/getinvolved.html
	web/html/index.html
	web/html/layout.css
	web/html/license.html
	web/html/report.html
	web/htp/body.htt
	web/htp/contact.htp
	web/htp/getinvolved.htp
	web/htp/htp.def
	web/htp/index.htp
	web/htp/license.htp
	web/htp/news.htp