Merge branch 'ms/mailmap'