Merge pull request #4550 from juliantaylor/datetime-test-fix-1.8

Datetime test fix 1.8