Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'