Merged revisions 70808 via svnmerge from