Merge branch 'jm/svn-pushmergeinfo-fix'