Merge branch 'jc/setlinebuf-setvbuf'