Merge branch 'master' into total-score

Conflicts:
	http/index.php