Merge branch 'jk/t0008-sigpipe-fix'