Merged revisions 89624 via svnmerge from