Merge branch 'ow/config-mailmap-pathname'