Merged revisions 83070 via svnmerge from