Merged revisions 98317 via svnmerge from