Attempt to resolve DST timezone change
Merge origin/master