Manually merge in DateTimeOffset fixes