Merge branch 'rs/strbuf-add-real-path' into maint