Merge "Canonical representation of floating point constants"