Merged revisions 77410 via svnmerge from