update mailmap
Merge pull request #3422 from adriaanm/mailmap

update mailmap