Merge branch 'ew/svn'