Merge "Update CREDITS and .mailmap files"