Merged revisions 83943 via svnmerge from