Merged revisions 97308 via svnmerge from