Merge branch 'rs/strbuf-addftime-zZ'