some more mailmap stuff