Merged revisions 77318 via svnmerge from