Merge "Update mailmap for Joe Gordon"