Merge master into HEAD

Conflicts:
	web/index.html