Merge branch 'rs/use-strbuf-complete-line'