Merge branch 'jh/strbuf-read-use-read-in-full'