Merge branch 'ss/doc-svn' into maint