Merged in default (pull request #702)

simple: Convert TCP read/write to gio

Approved-by: Gary Kramlich