Commit 7cdbb39e0a92d08d8c4edd827aeed81ffc74f1a4

Edward Thomson 2016-02-08T17:14:43

Merge pull request #3600 from ethomson/mailmap mailmap: add ethomson@github.com