Merged revisions 70445 via svnmerge from