Merge origin/master

Conflicts:
	testFromgit.php
Merge origin/master