Merge change 3676 into donut

* changes:
  Get the FormatDateRange tests passing again.