Merge branch 'mg/mailmap-update'