Merge branch 'rs/strbuf-leakfix'