Merge branch 'mg/mailmap-update' into maint