Some fixes.
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	foundation/stream/esxStringStream.h