Merged revisions 84735 via svnmerge from