Merge branch 'jc/maint-strbuf-add-fix-doubling'