.
Merge branch 'master' into stage

Conflicts:
	TestFile.php