Merge origin/master

Conflicts:
	requirements.php