Merged revisions 103070 via svnmerge from