Merged revisions 77348 via svnmerge from