Merged revisions 80360 via svnmerge from