Merge branch 'pb/strbuf-read-file-doc' into maint