MFC r255472:
Clear correct data structure.
MFC r248114 (by melifaro):

Add forgotten .El
Merge remote-tracking branch 'upstream-github/stable/9' into stable/9