Merged revisions 70397 via svnmerge from