Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request !1399
0 jobs for develop