Merged revisions 76654 via svnmerge from