Merged revisions 107290 via svnmerge from