Merge branch 'ml/mailmap' into maint-1.7.6