Merge branch 'bc/vcs-svn-cleanup' into maint