Merged revisions 81387 via svnmerge from