Merged revisions 104920 via svnmerge from