Merge branch 'rs/strbuf-read-file-or-whine'