Merged revisions 104135 via svnmerge from