Update .mailmap for git shortlog.
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Update .mailmap for git shortlog.