Merge commit '158452fd39b665c7862798614b1fef7ea0af6e30'

Conflicts:
	test.php
Merge branch 'master' of https://github.com/markjanstice/Test.git