tweaking mailmap
Merge remote-tracking branch 'gitlab/updates' into testing