master
Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	testphp/index.php