Merged revisions 81381 via svnmerge from