Merge branch 'lh/svn-first-parent'