Merged revisions 82961 via svnmerge from