Merge change 4990 into donut

* changes:
  Fix a few more blatantly wrong date formats.