Merged revisions 66474 via svnmerge from