Merged revisions 89618 via svnmerge from