Merge "Update to latest tzdata / switch back to zones.tab"