Merged revisions 89536 via svnmerge from