Merged revisions 81997 via svnmerge from