Code

Merge branch 'jc/maint-svn-info-test-fix' into maint