Bug 836800 - Fix timezone parsing bug