Fixed non-merge bug with TCPGOSSIP. Was fixed a long time ago in master, no need to forward-port