Merge branch 'ow/config-mailmap-pathname' into maint