Merged revisions 89205 via svnmerge from