Merge master into HEAD

Conflicts:
	index.php