Merge branch 'jk/strbuf-detach-always-non-null'