Merge branch 'sv/svn'