Merged revisions 70062 via svnmerge from