Fix my name in the given credit
Add some trace info as well as update CLIENT_ flags
Merge branch 'PHP-5.6'

Conflicts:
	NEWS