Fix ISO 8601.
Merge pull request #1491 from xfix/feature

Fix ISO 8601.