Merge branch 'jc/log-mailmap-flip-defaults'