Merge branch 'jc/mailmap-case-insensitivity'