am 58ee0371: Merge change 4990 into donut

Merge commit '58ee037191b5d9c2b149870868f9646bd428af2a'

* commit '58ee037191b5d9c2b149870868f9646bd428af2a':
  Fix a few more blatantly wrong date formats.