Update .mailmap
Merge pull request #8546 from WestleyArgentum/patch-6

Update .mailmap