Merged revisions 88709 via svnmerge from