Merged revisions 104106 via svnmerge from