Merged revisions 81189 via svnmerge from