Merge change 6323

* changes:
  Parse floating point (and double) constants.