Merge branch 'jc/strbuf-getline'