Code

Merge branch 'bd/diff-strbuf'