Merge origin/master

Conflicts:
	testgit.php