Merge change 2502 into donut

* changes:
  minor clean-up to Rect and Point.