Merged revisions 71003 via svnmerge from