Merged revisions 105059 via svnmerge from