Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively'