Merged revisions 80539 via svnmerge from