Import vanilla 2.3.9.4.
Merge tag 'v2.3.9.4' into general-fixes

Vanilla 2.3.9.4.

Conflicts:
	SocketThread.cpp
	SocketThread.h