Merge branch 'ew/svn-fixes' into maint