Merge remote-tracking branch 'origin/master' into kim-sym-semifield

# Conflicts:
#	src/Lean/Meta/Sym/Arith/Norm.lean