dgdfg
Merge branch 'master' into dev_tinker

Conflicts:
	test.php
$b text