Merge change 3754 into donut

* changes:
  Fix some 12- vs 24-hour problems in the FormatDateRange strings.