Merge branch 'tr/maint-strbuf-grow-nul-termination'