Import vanilla 2.3.9.6.
Merge tag 'v2.3.9.6' into general-fixes

Vanilla 2.3.9.6.

Conflicts:
	TcpSocket.cpp
Merge branch 'general-fixes' into ray

Conflicts:
	Makefile
	tests/Makefile