master / merge

Conflicts:
	test_2.php