Merged revisions 104015 via svnmerge from