Merge branch 'MyNewBranch' into master2

Conflicts:
	Test.php