Merged revisions 80932 via svnmerge from