master
Merge branch 'master' into branch1

Conflicts:
	main.php