Merge branch 'svn-rev'