Merged revisions 104625 via svnmerge from