Fix problem with inconsistent time zones. This now also fixes Issue #3896.

Signed-off-by: Paul G <p.ganssle@gmail.com>