Merged revisions 104596 via svnmerge from