[ .mailmap ] Added some names
Merge branch 'maint-2.4.0'