Code

Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint