Merged revisions 96198 via svnmerge from