Fix/mailmap again

final fixes for 0.86 release :)