Merge branch 'jk/mailmap-incomplete-line' into maint