Merge branch 'sb/mailmap-updates'