Merged revisions 87294 via svnmerge from