Merge origin/master

Conflicts:
	test.php
Merge origin/master
Merge origin/master

Conflicts:
	test.php
Merge origin/master
Merge origin/master

Conflicts:
	test.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	test.php