Merged revisions 83121 via svnmerge from