Merge branch 'ew/svn-branch-segfault-fix' into maint