Merge change 7464

* changes:
  Improve numerical constant parsing.