Merge branch 'dm/svn-remote'