Merged revisions 66074 via svnmerge from