Merge branch 'svn'