Merged revisions 77380 via svnmerge from