Merged revisions 70164 via svnmerge from