Merge branch 'sl/maint-git-svn-docs' into maint