Merge branch 'jn/strbuf-doc-re-reuse' into maint