Merge branch 'jd/fix-strbuf-add-urlencode-bytes'