Merged revisions 84692 via svnmerge from