Commit 96882f201a21ce2a07678b84cf1df0afa41402f9

Edward Thomson 2018-06-18T10:13:11

Merge pull request #4586 from emilio/mailmap Add mailmap support.