Rerecorded the merge of r78340, which got accidentally deleted in an svnmerge problem while checking in r78352.