Merged revisions 97575 via svnmerge from