Merged revisions 88116 via svnmerge from