Merged revisions 84717 via svnmerge from