Merged revisions 70949 via svnmerge from