Fix for #588 and #213 dealing with Daylight Savings Time