Merged revisions 103770 via svnmerge from