Merged revisions 89709 via svnmerge from