Merge pull request #1415 from bradymiller/fix-date-format