Merge branch 'jk/no-sigpipe-during-network-transport'