Merge pull request #2045 from BillSeurer/timezone