Merged revisions 78936 via svnmerge from