Merged revisions 65853 via svnmerge from