Merge branch 'jc/strbuf-branchname-fix' into maint