Fixed daylight/standard time issue
Merge remote-tracking branch 'upstream/master' into integration