Merge branch 'ap/strbuf-humanize'