Backport pull 913 date parse fixes

This backports #913 to the 1.3.x branch via `git rebase`