Merged revisions 65978 via svnmerge from