Fix daylight savings time bug
Merge remote branch 'upstream/master'