Fix [743338466549f09e3956d8a86e6f9a8030f227cb|7433384665]: socket error encoding bug.
merge trunk