Merged revisions 71066 via svnmerge from