Merged revisions 77783 via svnmerge from