Merge branch 'jn/vcs-svn-cleanup'