Merge branch 'rr/git-uri-doc' into maint