Merged revisions 85392 via svnmerge from