Merged revisions 89495 via svnmerge from