Merge branch 'ew/svn-maint-fixes' into maint