mathlib3

b7022a09 - Merge branch 'alexjbest/fix-zmod-diamond' into alexjbest/hasse