Code

Merge branch 'jm/mailmap'