Merged revisions 77154 via svnmerge from