Merge "SocketClient: don't ignore SIGPIPE"