Merge change 4947 into donut

* changes:
  Yet another round of trying to get the date formats right.