Merge branch 'svn-maint-fixes' into svn-fixes