more mailmap stuff