Merged revisions 65841 via svnmerge from