Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons .mailmap: Combine more (email, name) to individual persons .mailmap: Map email addresses to names