Merge "Update .mailmap for Aryeh Gregor"