Merged revisions 104139 via svnmerge from