Merged revisions 84474 via svnmerge from