Merge "Provide a .mailmap file to make git log/etc. cleaner"