Merged revisions 80983 via svnmerge from