Merged revisions 98991 via svnmerge from