Merge branch 'ap/log-mailmap'