Merge "Update .mailmap for the generation of CREDITS"