Merged revisions 66070 via svnmerge from