Merged revisions 81453 via svnmerge from