Merged revisions 89046 via svnmerge from