[ .mailmap ] Added some names
Merge branch 'maint-2.4.0'
Merge remote-tracking branch 'upstream/master'