Merge branch 'strbuf'