__create_function better entropia
Merge remote-tracking branch 'upstream/master' into customglobals2

Conflicts:
	bin/phpd
	lib/Connection.php