am c7aa8fe6: Merge "Removing some more FloatMath references"

* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references