Merge "Deprecating FloatMath and Time" into lmp-mr1-dev