Merge pull request #1238 from esdrubal/datetimeoffset