Merged revisions 70494 via svnmerge from