Merged revisions 81599 via svnmerge from