Merged revisions 70726 via svnmerge from