Merge branch 'ap/commit-author-mailmap'