am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible"

* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible