Fix issue #1258

Correctly handle DEFAULT_DATE = None .
Merge pull request #1262 from utdemir/master

Fix issue #1258