Merged revisions 89491 via svnmerge from