Merged revisions 66404 via svnmerge from