Merged revisions 104141 via svnmerge from