Merge ".mailmap: Fix my name to use the form used elsewhere"