Fix/mailmap again

final fixes for 0.86 release :)
There seems to be an encoding problem here