Merge branch 'jk/maint-strbuf-missing-init'