Merge up to a197e6853e. Still works. Next checkin restarts the segfaults.

42 files changed, 1858 insertions, 1026 deletions

diff --git a/library/auto.tcl b/library/auto.tcl
index 4bd860d..78c219e 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -20,8 +20,9 @@
 # None.
 
 proc auto_reset {} {
-    if {[array exists ::auto_index]} {
-	foreach cmdName [array names ::auto_index] {
+    global auto_execs auto_index auto_path
+    if {[array exists auto_index]} {
+	foreach cmdName [array names auto_index] {
 	    set fqcn [namespace which $cmdName]
 	    if {$fqcn eq ""} {
 		continue
@@ -29,11 +30,11 @@ proc auto_reset {} {
 	    rename $fqcn {}
 	}
     }
-    unset -nocomplain ::auto_execs ::auto_index ::tcl::auto_oldpath
-    if {[catch {llength $::auto_path}]} {
-	set ::auto_path [list [info library]]
-    } elseif {[info library] ni $::auto_path} {
-	lappend ::auto_path [info library]
+    unset -nocomplain auto_execs auto_index ::tcl::auto_oldpath
+    if {[catch {llength $auto_path}]} {
+	set auto_path [list [info library]]
+    } elseif {[info library] ni $auto_path} {
+	lappend auto_path [info library]
     }
 }
 
@@ -53,7 +54,7 @@ proc auto_reset {} {
 
 proc tcl_findLibrary {basename version patch initScript enVarName varName} {
     upvar #0 $varName the_library
-    global env
+    global auto_path env tcl_platform
 
     set dirs {}
     set errors {}
@@ -83,12 +84,10 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 	# 3. Relative to auto_path directories.  This checks relative to the
 	# Tcl library as well as allowing loading of libraries added to the
 	# auto_path that is not relative to the core library or binary paths.
-	foreach d $::auto_path {
+	foreach d $auto_path {
 	    lappend dirs [file join $d $basename$version]
-	    if {
-		$::tcl_platform(platform) eq "unix"
-		&& $::tcl_platform(os) eq "Darwin"
-	    } then {
+	    if {$tcl_platform(platform) eq "unix"
+		    && $tcl_platform(os) eq "Darwin"} {
 		# 4. On MacOSX, check the Resources/Scripts subdir too
 		lappend dirs [file join $d $basename$version Resources Scripts]
 	    }
@@ -606,6 +605,29 @@ auto_mkindex_parser::command namespace {op args} {
             }
             catch {$parser eval "_%@namespace import $args"}
         }
+	ensemble {
+	    variable parser
+	    variable contextStack
+	    if {[lindex $args 0] eq "create"} {
+		set name ::[join [lreverse $contextStack] ::]
+		# create artifical proc to force an entry in the tclIndex
+		$parser eval [list ::proc $name {} {}]
+	    }
+	}
+    }
+}
+
+# AUTO MKINDEX:  oo::class create name ?definition?
+# Adds an entry to the auto index list for the given class name.
+foreach cmd {oo::class class} {
+    auto_mkindex_parser::command $cmd {ecmd name {body ""}} {
+	if {$cmd eq "create"} {
+	    variable index
+	    variable scriptFile
+	    append index [format "set %s \[list source \[%s]]\n" \
+			      [list auto_index([fullname $name])] \
+			      [list file join $dir {*}[file split $scriptFile]]]
+	}
     }
 }
 
diff --git a/library/clock.tcl b/library/clock.tcl
index 0696c47..1e652b4 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -324,7 +324,7 @@ proc ::tcl::clock::Initialize {} {
 	{-10800 0 3600 0 2 0 2 2 0 0 0 0 10 0 3 2 0 0 0} :America/Sao_Paulo
 	{-10800 0 3600 0 10 0 5 2 0 0 0 0 4 0 1 2 0 0 0} :America/Godthab
 	{-10800 0 3600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}  :America/Buenos_Aires
-        {-10800 0 3600 0 2 0 5 2 0 0 0 0 11 0 1 2 0 0 0} :America/Brasilia
+        {-10800 0 3600 0 2 0 5 2 0 0 0 0 11 0 1 2 0 0 0} :America/Bahia
         {-10800 0 3600 0 3 0 2 2 0 0 0 0 10 0 1 2 0 0 0} :America/Montevideo
 	{-7200 0 3600 0 9 0 5 2 0 0 0 0 3 0 5 2 0 0 0}   :America/Noronha
 	{-3600 0 3600 0 10 0 5 3 0 0 0 0 3 0 5 2 0 0 0}  :Atlantic/Azores
@@ -3861,7 +3861,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
 
     # Put DST in effect in all years from 1916 to 2099.
 
-    for { set y 1916 } { $y < 2099 } { incr y } {
+    for { set y 1916 } { $y < 2100 } { incr y } {
 	set startTime [DeterminePosixDSTTime $z start $y]
 	incr startTime [expr { - wide($stdOffset) }]
 	set endTime [DeterminePosixDSTTime $z end $y]
diff --git a/library/http/http.tcl b/library/http/http.tcl
index d57e3ce..3754f71 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -11,7 +11,7 @@
 package require Tcl 8.6
 # Keep this in sync with pkgIndex.tcl and with the install directories in
 # Makefiles
-package provide http 2.8.5
+package provide http 2.8.7
 
 namespace eval http {
     # Allow resourcing to not clobber existing data
@@ -394,13 +394,16 @@ proc http::geturl {url args} {
     # First, before the colon, is the protocol scheme (e.g. http)
     # Second, for HTTP-like protocols, is the authority
     #	The authority is preceded by // and lasts up to (but not including)
-    #	the following / and it identifies up to four parts, of which only one,
-    #	the host, is required (if an authority is present at all). All other
-    #	parts of the authority (user name, password, port number) are optional.
+    #	the following / or ? and it identifies up to four parts, of which
+    #	only one, the host, is required (if an authority is present at all).
+    #	All other parts of the authority (user name, password, port number)
+    #	are optional.
     # Third is the resource name, which is split into two parts at a ?
     #	The first part (from the single "/" up to "?") is the path, and the
     #	second part (from that "?" up to "#") is the query. *HOWEVER*, we do
     #	not need to separate them; we send the whole lot to the server.
+    #	Both, path and query are allowed to be missing, including their
+    #	delimiting character.
     # Fourth is the fragment identifier, which is everything after the first
     #	"#" in the URL. The fragment identifier MUST NOT be sent to the server
     #	and indeed, we don't bother to validate it (it could be an error to
@@ -437,7 +440,7 @@ proc http::geturl {url args} {
 	    )
 	    (?: : (\d+) )?		# <port part of authority>
 	)?
-	( / [^\#]*)?			# <path> (including query)
+	( [/\?] [^\#]*)?		# <path> (including query)
 	(?: \# (.*) )?			# <fragment>
 	$
     }
@@ -481,6 +484,12 @@ proc http::geturl {url args} {
 	}
     }
     if {$srvurl ne ""} {
+	# RFC 3986 allows empty paths (not even a /), but servers
+	# return 400 if the path in the HTTP request doesn't start
+	# with / , so add it here if needed.
+	if {[string index $srvurl 0] ne "/"} {
+	    set srvurl /$srvurl
+	}
 	# Check for validity according to RFC 3986, Appendix A
 	set validityRE {(?xi)
 	    ^
@@ -537,11 +546,10 @@ proc http::geturl {url args} {
     # If a timeout is specified we set up the after event and arrange for an
     # asynchronous socket connection.
 
-    set sockopts [list]
+    set sockopts [list -async]
     if {$state(-timeout) > 0} {
 	set state(after) [after $state(-timeout) \
 		[list http::reset $token timeout]]
-	lappend sockopts -async
     }
 
     # If we are using the proxy, we must pass in the full URL that includes
@@ -597,10 +605,15 @@ proc http::geturl {url args} {
         set socketmap($state(socketinfo)) $sock
     }
 
-    # Wait for the connection to complete.
+    if {![info exists phost]} {
+	set phost ""
+    }
+    fileevent $sock writable [list http::Connect $token $proto $phost $srvurl]
 
-    if {$state(-timeout) > 0} {
-	fileevent $sock writable [list http::Connect $token]
+    # Wait for the connection to complete.
+    if {![info exists state(-command)]} {
+	# geturl does EVERYTHING asynchronously, so if the user
+	# calls it synchronously, we just do a wait here.
 	http::wait $token
 
 	if {![info exists state]} {
@@ -616,13 +629,29 @@ proc http::geturl {url args} {
 	    set err [lindex $state(error) 0]
 	    cleanup $token
 	    return -code error $err
-	} elseif {$state(status) ne "connect"} {
-	    # Likely to be connection timeout
-	    return $token
 	}
-	set state(status) ""
     }
 
+    return $token
+}
+
+
+proc http::Connected { token proto phost srvurl} {
+    variable http
+    variable urlTypes
+
+    variable $token
+    upvar 0 $token state
+
+    # Set back the variables needed here
+    set sock $state(sock)
+    set isQueryChannel [info exists state(-querychannel)]
+    set isQuery [info exists state(-query)]
+    set host [lindex [split $state(socketinfo) :] 0]
+    set port [lindex [split $state(socketinfo) :] 1]
+
+    set defport [lindex $urlTypes($proto) 0]
+
     # Send data in cr-lf format, but accept any line terminators
 
     fconfigure $sock -translation {auto crlf} -buffersize $state(-blocksize)
@@ -753,35 +782,17 @@ proc http::geturl {url args} {
 	    fileevent $sock readable [list http::Event $sock $token]
 	}
 
-	if {![info exists state(-command)]} {
-	    # geturl does EVERYTHING asynchronously, so if the user calls it
-	    # synchronously, we just do a wait here.
-
-	    wait $token
-	    if {$state(status) eq "error"} {
-		# Something went wrong, so throw the exception, and the
-		# enclosing catch will do cleanup.
-		return -code error [lindex $state(error) 0]
-	    }
-	}
     } err]} {
 	# The socket probably was never connected, or the connection dropped
 	# later.
 
-	# Clean up after events and such, but DON'T call the command callback
-	# (if available) because we're going to throw an exception from here
-	# instead.
-
 	# if state(status) is error, it means someone's already called Finish
 	# to do the above-described clean up.
 	if {$state(status) ne "error"} {
-	    Finish $token $err 1
+	    Finish $token $err
 	}
-	cleanup $token
-	return -code error $err
     }
 
-    return $token
 }
 
 # Data access functions:
@@ -865,7 +876,7 @@ proc http::cleanup {token} {
 #	Sets the status of the connection, which unblocks
 # 	the waiting geturl call
 
-proc http::Connect {token} {
+proc http::Connect {token proto phost srvurl} {
     variable $token
     upvar 0 $token state
     set err "due to unexpected EOF"
@@ -873,10 +884,10 @@ proc http::Connect {token} {
 	[eof $state(sock)] ||
 	[set err [fconfigure $state(sock) -error]] ne ""
     } {
-	Finish $token "connect failed $err" 1
+	Finish $token "connect failed $err"
     } else {
-	set state(status) connect
 	fileevent $state(sock) writable {}
+	::http::Connected $token $proto $phost $srvurl
     }
     return
 }
@@ -981,7 +992,7 @@ proc http::Event {sock token} {
 	} elseif {$n == 0} {
 	    # We have now read all headers
 	    # We ignore HTTP/1.1 100 Continue returns. RFC2616 sec 8.2.3
-	    if {$state(http) == "" || [lindex $state(http) 1] == 100} {
+	    if {$state(http) == "" || ([regexp {^\S+\s(\d+)} $state(http) {} x] && $x == 100)} {
 		return
 	    }
 
@@ -1379,7 +1390,7 @@ proc http::mapReply {string} {
     }
     set converted [string map $formMap $string]
     if {[string match "*\[\u0100-\uffff\]*" $converted]} {
-	regexp {[\u0100-\uffff]} $converted badChar
+	regexp "\[\u0100-\uffff\]" $converted badChar
 	# Return this error message for maximum compatability... :^/
 	return -code error \
 	    "can't read \"formMap($badChar)\": no such element in array"
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index 303d3bd..aaa3e85 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6]} {return}
-package ifneeded http 2.8.5 [list tclPkgSetup $dir http 2.8.5 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
+package ifneeded http 2.8.7 [list tclPkgSetup $dir http 2.8.7 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
diff --git a/library/init.tcl b/library/init.tcl
index e836df9..bedc06e 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -12,6 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 
+# This test intentionally written in pre-7.5 Tcl 
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
@@ -116,9 +117,10 @@ namespace eval tcl {
 if {(![interp issafe]) && ($tcl_platform(platform) eq "windows")} {
     namespace eval tcl {
 	proc EnvTraceProc {lo n1 n2 op} {
-	    set x $::env($n2)
-	    set ::env($lo) $x
-	    set ::env([string toupper $lo]) $x
+	    global env
+	    set x $env($n2)
+	    set env($lo) $x
+	    set env([string toupper $lo]) $x
 	}
 	proc InitWinEnv {} {
 	    global env tcl_platform
@@ -159,8 +161,8 @@ if {[interp issafe]} {
 } else {
     # Set up search for Tcl Modules (TIP #189).
     # and setup platform specific unknown package handlers
-    if {$::tcl_platform(os) eq "Darwin"
-	    && $::tcl_platform(platform) eq "unix"} {
+    if {$tcl_platform(os) eq "Darwin"
+	    && $tcl_platform(platform) eq "unix"} {
 	package unknown {::tcl::tm::UnknownHandler \
 		{::tcl::MacOSXPkgUnknown ::tclPkgUnknown}}
     } else {
@@ -233,14 +235,13 @@ if {[namespace which -command tclLog] eq ""} {
 
 proc unknown args {
     variable ::tcl::UnknownPending
-    global auto_noexec auto_noload env tcl_interactive
+    global auto_noexec auto_noload env tcl_interactive errorInfo errorCode
 
-
-    if {[info exists ::errorInfo]} {
-	set savedErrorInfo $::errorInfo
+    if {[info exists errorInfo]} {
+	set savedErrorInfo $errorInfo
     }
-    if {[info exists ::errorCode]} {
-	set savedErrorCode $::errorCode
+    if {[info exists errorCode]} {
+	set savedErrorCode $errorCode
     }
 
     set name [lindex $args 0]
@@ -271,9 +272,9 @@ proc unknown args {
 		unset -nocomplain ::errorCode
 	    }
 	    if {[info exists savedErrorInfo]} {
-		set ::errorInfo $savedErrorInfo
+		set errorInfo $savedErrorInfo
 	    } else {
-		unset -nocomplain ::errorInfo
+		unset -nocomplain errorInfo
 	    }
 	    set code [catch {uplevel 1 $args} msg opts]
 	    if {$code ==  1} {
@@ -282,8 +283,8 @@ proc unknown args {
 		# Note the dependence on how Tcl_AddErrorInfo, etc.
 		# construct the stack trace.
 		#
-		set errorInfo [dict get $opts -errorinfo]
-		set errorCode [dict get $opts -errorcode]
+		set errInfo [dict get $opts -errorinfo]
+		set errCode [dict get $opts -errorcode]
 		set cinfo $args
 		if {[string bytelength $cinfo] > 150} {
 		    set cinfo [string range $cinfo 0 150]
@@ -300,7 +301,7 @@ proc unknown args {
 		# and trim the extra contribution from the matching case
 		#
 		set expect "$msg\n    while executing\n\"$cinfo"
-		if {$errorInfo eq $expect} {
+		if {$errInfo eq $expect} {
 		    #
 		    # The stack has only the eval from the expanded command
 		    # Do not generate any stack trace here.
@@ -315,18 +316,18 @@ proc unknown args {
 		#
 		set expect "\n    invoked from within\n\"$cinfo"
 		set exlen [string length $expect]
-		set eilen [string length $errorInfo]
+		set eilen [string length $errInfo]
 		set i [expr {$eilen - $exlen - 1}]
-		set einfo [string range $errorInfo 0 $i]
+		set einfo [string range $errInfo 0 $i]
 		#
-		# For now verify that $errorInfo consists of what we are about
+		# For now verify that $errInfo consists of what we are about
 		# to return plus what we expected to trim off.
 		#
-		if {$errorInfo ne "$einfo$expect"} {
+		if {$errInfo ne "$einfo$expect"} {
 		    error "Tcl bug: unexpected stack trace in \"unknown\"" {} \
-			[list CORE UNKNOWN BADTRACE $einfo $expect $errorInfo]
+			[list CORE UNKNOWN BADTRACE $einfo $expect $errInfo]
 		}
-		return -code error -errorcode $errorCode \
+		return -code error -errorcode $errCode \
 			-errorinfo $einfo $msg
 	    } else {
 		dict incr opts -level
@@ -335,7 +336,7 @@ proc unknown args {
 	}
     }
 
-    if {([info level] == 1) && ([info script] eq "") \
+    if {([info level] == 1) && ([info script] eq "") 
 	    && [info exists tcl_interactive] && $tcl_interactive} {
 	if {![info exists auto_noexec]} {
 	    set new [auto_execok $name]
@@ -788,7 +789,7 @@ proc tcl::CopyDirectory {action src dest} {
 	    lappend existing {*}[glob -nocomplain -directory $dest \
 		    -type hidden * .*]
 	    foreach s $existing {
-		if {([file tail $s] ne ".") && ([file tail $s] ne "..")} {
+		if {[file tail $s] ni {. ..}} {
 		    return -code error "error $action \"$src\" to\
 		      \"$dest\": file already exists"
 		}
@@ -796,7 +797,7 @@ proc tcl::CopyDirectory {action src dest} {
 	}
     } else {
 	if {[string first $nsrc $ndest] != -1} {
-	    set srclen [expr {[llength [file split $nsrc]] -1}]
+	    set srclen [expr {[llength [file split $nsrc]] - 1}]
 	    set ndest [lindex [file split $ndest] $srclen]
 	    if {$ndest eq [file tail $nsrc]} {
 		return -code error "error $action \"$src\" to\
@@ -816,37 +817,9 @@ proc tcl::CopyDirectory {action src dest} {
       [glob -nocomplain -directory $src -types hidden *]]
 
     foreach s [lsort -unique $filelist] {
-	if {([file tail $s] ne ".") && ([file tail $s] ne "..")} {
-	    file copy -force $s [file join $dest [file tail $s]]
+	if {[file tail $s] ni {. ..}} {
+	    file copy -force -- $s [file join $dest [file tail $s]]
 	}
     }
     return
 }
-
-# TIP 131
-if 0 {
-proc tcl::rmmadwiw {} {
-    set magic {
-        42 83 fe f6 ff f8 f1 e5 c6 f9 eb fd ff fb f1 e5 cc f5 ec f5 e3 fd fe
-        ff f5 fa f3 e1 c7 f9 f2 fd ff f9 fe f9 ed f4 fa f6 e6 f9 f2 e6 fd f9
-        ff f9 f6 e6 fa fd ff fc fb fc f9 f1 ed
-    }
-    foreach mystic [lassign $magic tragic] {
-        set comic [expr (0x$mystic ^ 0x$tragic) - 255 + 0x$tragic]
-        append logic [format %x $comic]
-        set tragic $mystic
-    }
-    binary format H* $logic
-}
-
-proc tcl::mathfunc::rmmadwiw {} {
-    set age [expr {9*6}]
-    set mind ""
-    while {$age} {
-        lappend mind [expr {$age%13}]
-        set age [expr {$age/13}]
-    }
-    set matter [lreverse $mind]
-    return [join $matter ""]
-}
-}
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 112507a..cf3b9d7 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -13,7 +13,7 @@
 package require Tcl 8.5
 # When the version number changes, be sure to update the pkgIndex.tcl file,
 # and the installation directory in the Makefiles.
-package provide msgcat 1.5.0
+package provide msgcat 1.5.2
 
 namespace eval msgcat {
     namespace export mc mcload mclocale mcmax mcmset mcpreferences mcset \
@@ -287,7 +287,7 @@ proc msgcat::mcload {langdir} {
     }
     set x 0
     foreach p [mcpreferences] {
-	if { $p eq {} } {
+	if {$p eq {}} {
 	    set p ROOT
 	}
 	set langfile [file join $langdir $p.msg]
@@ -374,7 +374,7 @@ proc msgcat::mcflset {src {dest ""}} {
 # Results:
 #	Returns the number of pairs processed
 
-proc msgcat::mcmset {locale pairs } {
+proc msgcat::mcmset {locale pairs} {
     variable Msgs
 
     set length [llength $pairs]
@@ -541,8 +541,11 @@ proc msgcat::Init {} {
     # settings, or fall back on locale of "C".
     #
 
-    # First check registry value LocalName present from Windows Vista
-    # which contains the local string as RFC5646, composed of:
+    # On Vista and later:
+    # HCU/Control Panel/Desktop : PreferredUILanguages is for language packs,
+    # HCU/Control Pannel/International : localName is the default locale.
+    #
+    # They contain the local string as RFC5646, composed of:
     # [a-z]{2,3} : language
     # -[a-z]{4}  : script (optional, translated by table Latn->latin)
     # -[a-z]{2}|[0-9]{3} : territory (optional, numerical region codes not used)
@@ -550,26 +553,25 @@ proc msgcat::Init {} {
     # Those are translated to local strings.
     # Examples: de-CH -> de_ch, sr-Latn-CS -> sr_cs@latin, es-419 -> es
     #
-    set key {HKEY_CURRENT_USER\Control Panel\International}
-    if {([registry values $key "LocaleName"] ne "")
-	    && [regexp {^([a-z]{2,3})(?:-([a-z]{4}))?(?:-([a-z]{2}))?(?:-.+)?$}\
-	    [string tolower [registry get $key "LocaleName"]] match locale\
-	    script territory]} {
-	if {"" ne $territory} {
-	    append locale _ $territory
-	}
-	set modifierDict [dict create latn latin cyrl cyrillic]
-	if {[dict exists $modifierDict $script]} {
-	    append locale @ [dict get $modifierDict $script]
-	}
-	if {![catch {
-	    mclocale [ConvertLocale $locale]
-	}]} {
-	    return
+    foreach key {{HKEY_CURRENT_USER\Control Panel\Desktop} {HKEY_CURRENT_USER\Control Panel\International}}\
+	    value {PreferredUILanguages localeName} {
+	if {![catch {registry get $key $value} localeName]
+		&& [regexp {^([a-z]{2,3})(?:-([a-z]{4}))?(?:-([a-z]{2}))?(?:-.+)?$}\
+		    [string tolower $localeName] match locale script territory]} {
+	    if {"" ne $territory} {
+		append locale _ $territory
+	    }
+	    set modifierDict [dict create latn latin cyrl cyrillic]
+	    if {[dict exists $modifierDict $script]} {
+		append locale @ [dict get $modifierDict $script]
+	    }
+	    if {![catch {mclocale [ConvertLocale $locale]}]} {
+		return
+	    }
 	}
     }
 
-    # then check key locale which contains a numerical language ID
+    # then check value locale which contains a numerical language ID
     if {[catch {
 	set locale [registry get $key "locale"]
     }]} {
diff --git a/library/msgcat/pkgIndex.tcl b/library/msgcat/pkgIndex.tcl
index 832bf81..5fabfe3 100644
--- a/library/msgcat/pkgIndex.tcl
+++ b/library/msgcat/pkgIndex.tcl
@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.5]} {return}
-package ifneeded msgcat 1.5.0 [list source [file join $dir msgcat.tcl]]
+package ifneeded msgcat 1.5.2 [list source [file join $dir msgcat.tcl]]
diff --git a/library/package.tcl b/library/package.tcl
index c30431c..52daa0e 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -395,9 +395,7 @@ proc pkg_mkIndex {args} {
 
     foreach pkg [lsort [array names files]] {
 	set cmd {}
-	foreach {name version} $pkg {
-	    break
-	}
+	lassign $pkg name version
 	lappend cmd ::tcl::Pkg::Create -name $name -version $version
 	foreach spec [lsort -index 0 $files($pkg)] {
 	    foreach {file type procs} $spec {
@@ -544,8 +542,7 @@ proc tclPkgUnknown {name args} {
 	# Don't add directories we've already seen, or ones already on the
 	# $use_path.
 	foreach dir [lrange $auto_path $index end] {
-	    if {![info exists tclSeenPath($dir)]
-		    && ([lsearch -exact $use_path $dir] == -1) } {
+	    if {![info exists tclSeenPath($dir)] && ($dir ni $use_path)} {
 		lappend use_path $dir
 	    }
 	}
@@ -628,8 +625,7 @@ proc tcl::MacOSXPkgUnknown {original name args} {
 	# Don't add directories we've already seen, or ones already on the
 	# $use_path.
 	foreach dir [lrange $auto_path $index end] {
-	    if {![info exists tclSeenPath($dir)]
-		    && ([lsearch -exact $use_path $dir] == -1) } {
+	    if {![info exists tclSeenPath($dir)] && ($dir ni $use_path)} {
 		lappend use_path $dir
 	    }
 	}
@@ -681,10 +677,7 @@ proc ::tcl::Pkg::Create {args} {
     }
 
     # Initialize parameters
-    set opts(-name)		{}
-    set opts(-version)		{}
-    set opts(-source)		{}
-    set opts(-load)		{}
+    array set opts {-name {} -version {} -source {} -load {}}
 
     # process parameters
     for {set i 0} {$i < $len} {incr i} {
@@ -732,14 +725,9 @@ proc ::tcl::Pkg::Create {args} {
     # Handle -load and -source specs
     foreach key {load source} {
 	foreach filespec $opts(-$key) {
-	    foreach {filename proclist} {{} {}} {
-		break
-	    }
-	    foreach {filename proclist} $filespec {
-		break
-	    }
-
-	    if {![llength $proclist]} {
+	    lassign $filespec filename proclist
+	    
+	    if { [llength $proclist] == 0 } {
 		set cmd "\[list $key \[file join \$dir [list $filename]\]\]"
 		lappend cmdList $cmd
 	    } else {
diff --git a/library/platform/pkgIndex.tcl b/library/platform/pkgIndex.tcl
index 220a67b..23a3408 100644
--- a/library/platform/pkgIndex.tcl
+++ b/library/platform/pkgIndex.tcl
@@ -1,3 +1,3 @@
-package ifneeded platform        1.0.10 [list source [file join $dir platform.tcl]]
+package ifneeded platform        1.0.12 [list source [file join $dir platform.tcl]]
 package ifneeded platform::shell 1.1.4 [list source [file join $dir shell.tcl]]
 
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index dd2e66b..5698425 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -256,7 +256,7 @@ proc ::platform::LibcVersion {base _->_ vv} {
     if {![catch {
 	set vdata [lindex [split [exec $libc] \n] 0]
     }]} {
-	regexp {([0-9]+(\.[0-9]+)*)} $vdata -> v
+	regexp {version ([0-9]+(\.[0-9]+)*)} $vdata -> v
 	foreach {major minor} [split $v .] break
 	set v glibc${major}.${minor}
 	return 1
@@ -368,7 +368,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready
 
-package provide platform 1.0.10
+package provide platform 1.0.12
 
 # ### ### ### ######### ######### #########
 ## Demo application
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 83ec9d3..d6e6487 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -84,7 +84,7 @@ namespace eval tcltest {
     #     None.
     #
     proc normalizePath {pathVar} {
-	upvar $pathVar path
+	upvar 1 $pathVar path
 	set oldpwd [pwd]
 	catch {cd $path}
 	set path [pwd]
@@ -247,15 +247,15 @@ namespace eval tcltest {
 
     # Kept only for compatibility
     Default constraintsSpecified {} AcceptList
-    trace variable constraintsSpecified r {set ::tcltest::constraintsSpecified \
-		[array names ::tcltest::testConstraints] ;# }
+    trace add variable constraintsSpecified read [namespace code {
+	    set constraintsSpecified [array names testConstraints] ;#}]
 
     # tests that use threads need to know which is the main thread
     Default mainThread 1
     variable mainThread
-    if {[info commands thread::id] != {}} {
+    if {[info commands thread::id] ne {}} {
 	set mainThread [thread::id]
-    } elseif {[info commands testthread] != {}} {
+    } elseif {[info commands testthread] ne {}} {
 	set mainThread [testthread id]
     }
 
@@ -263,7 +263,7 @@ namespace eval tcltest {
     # Tcl tests is the working directory.  Whenever this value changes
     # change to that directory.
     variable workingDirectory
-    trace variable workingDirectory w \
+    trace add variable workingDirectory write \
 	    [namespace code {cd $workingDirectory ;#}]
 
     Default workingDirectory [pwd] AcceptAbsolutePath
@@ -277,7 +277,7 @@ namespace eval tcltest {
 
     # Set the location of the execuatble
     Default tcltest [info nameofexecutable]
-    trace variable tcltest w [namespace code {testConstraint stdio \
+    trace add variable tcltest write [namespace code {testConstraint stdio \
 	    [eval [ConstraintInitializer stdio]] ;#}]
 
     # save the platform information so it can be restored later
@@ -404,11 +404,11 @@ namespace eval tcltest {
 		# already there.
 		set outdir [normalizePath [file dirname \
 			[file join [pwd] $filename]]]
-		if {[string equal $outdir [temporaryDirectory]]} {
+		if {$outdir eq [temporaryDirectory]} {
 		    variable filesExisted
 		    FillFilesExisted
 		    set filename [file tail $filename]
-		    if {[lsearch -exact $filesExisted $filename] == -1} {
+		    if {$filename ni $filesExisted} {
 			lappend filesExisted $filename
 		    }
 		}
@@ -448,11 +448,11 @@ namespace eval tcltest {
 		# already there.
 		set outdir [normalizePath [file dirname \
 			[file join [pwd] $filename]]]
-		if {[string equal $outdir [temporaryDirectory]]} {
+		if {$outdir eq [temporaryDirectory]} {
 		    variable filesExisted
 		    FillFilesExisted
 		    set filename [file tail $filename]
-		    if {[lsearch -exact $filesExisted $filename] == -1} {
+		    if {$filename ni $filesExisted} {
 			lappend filesExisted $filename
 		    }
 		}
@@ -534,7 +534,7 @@ namespace eval tcltest {
 	    }
 	    default {
 		# Exact match trumps ambiguity
-		if {[lsearch -exact $match $option] >= 0} {
+		if {$option in $match} {
 		    return $option
 		}
 		set values [join [lrange $match 0 end-1] ", "]
@@ -549,7 +549,8 @@ namespace eval tcltest {
 	variable OptionControlledVariables
 	foreach varName [concat $OptionControlledVariables Option] {
 	    variable $varName
-	    trace variable $varName r [namespace code {ProcessCmdLineArgs ;#}]
+	    trace add variable $varName read [namespace code {
+		    ProcessCmdLineArgs ;#}]
 	}
     }
 
@@ -557,11 +558,11 @@ namespace eval tcltest {
 	variable OptionControlledVariables
 	foreach varName [concat $OptionControlledVariables Option] {
 	    variable $varName
-	    foreach pair [trace vinfo $varName] {
-		foreach {op cmd} $pair break
-		if {[string equal r $op]
-			&& [string match *ProcessCmdLineArgs* $cmd]} {
-		    trace vdelete $varName $op $cmd
+	    foreach pair [trace info variable $varName] {
+		lassign $pair op cmd
+		if {($op eq "read") &&
+			[string match *ProcessCmdLineArgs* $cmd]} {
+		    trace remove variable $varName $op $cmd
 		}
 	    }
 	}
@@ -698,7 +699,7 @@ namespace eval tcltest {
     Option -constraints {} {
 	Do not skip the listed constraints listed in -constraints.
     } AcceptList
-    trace variable Option(-constraints) w \
+    trace add variable Option(-constraints) write \
 	    [namespace code {SetSelectedConstraints ;#}]
 
     # Don't run only the "-constraint" specified tests by default
@@ -707,7 +708,7 @@ namespace eval tcltest {
 	variable testConstraints
 	if {!$Option(-limitconstraints)} {return}
 	foreach c [array names testConstraints] {
-	    if {[lsearch -exact $Option(-constraints) $c] == -1} {
+	    if {$c ni $Option(-constraints)} {
 		testConstraint $c 0
 	    }
 	}
@@ -715,7 +716,7 @@ namespace eval tcltest {
     Option -limitconstraints 0 {
 	whether to run only tests with the constraints
     } AcceptBoolean limitConstraints 
-    trace variable Option(-limitconstraints) w \
+    trace add variable Option(-limitconstraints) write \
 	    [namespace code {ClearUnselectedConstraints ;#}]
 
     # A test application has to know how to load the tested commands
@@ -736,7 +737,7 @@ namespace eval tcltest {
 	}
 	set directory [AcceptDirectory $directory]
 	if {![file writable $directory]} {
-	    if {[string equal [workingDirectory] $directory]} {
+	    if {[workingDirectory] eq $directory} {
 		# Special exception: accept the default value
 		# even if the directory is not writable
 		return $directory
@@ -750,7 +751,7 @@ namespace eval tcltest {
     Option -tmpdir [workingDirectory] {
 	Save temporary files in the specified directory.
     } AcceptTemporaryDirectory temporaryDirectory
-    trace variable Option(-tmpdir) w \
+    trace add variable Option(-tmpdir) write \
 	    [namespace code {normalizePath Option(-tmpdir) ;#}]
 
     # Tests should not rely on the current working directory.
@@ -759,17 +760,17 @@ namespace eval tcltest {
     Option -testdir [workingDirectory] {
 	Search tests in the specified directory.
     } AcceptDirectory testsDirectory
-    trace variable Option(-testdir) w \
+    trace add variable Option(-testdir) write \
 	    [namespace code {normalizePath Option(-testdir) ;#}]
 
     proc AcceptLoadFile { file } {
-	if {[string equal "" $file]} {return $file}
+	if {$file eq {}} {return $file}
 	set file [file join [temporaryDirectory] $file]
 	return [AcceptReadable $file]
     }
     proc ReadLoadScript {args} {
 	variable Option
-	if {[string equal "" $Option(-loadfile)]} {return}
+	if {$Option(-loadfile) eq {}} {return}
 	set tmp [open $Option(-loadfile) r]
 	loadScript [read $tmp]
 	close $tmp
@@ -777,7 +778,7 @@ namespace eval tcltest {
     Option -loadfile {} {
 	Read the script to load the tested commands from the specified file.
     } AcceptLoadFile loadFile
-    trace variable Option(-loadfile) w [namespace code ReadLoadScript]
+    trace add variable Option(-loadfile) write [namespace code ReadLoadScript]
 
     proc AcceptOutFile { file } {
 	if {[string equal stderr $file]} {return $file}
@@ -789,14 +790,14 @@ namespace eval tcltest {
     Option -outfile stdout {
 	Send output from test runs to the specified file.
     } AcceptOutFile outputFile
-    trace variable Option(-outfile) w \
+    trace add variable Option(-outfile) write \
 	    [namespace code {outputChannel $Option(-outfile) ;#}]
 
     # errors go to stderr by default
     Option -errfile stderr {
 	Send errors from test runs to the specified file.
     } AcceptOutFile errorFile
-    trace variable Option(-errfile) w \
+    trace add variable Option(-errfile) write \
 	    [namespace code {errorChannel $Option(-errfile) ;#}]
 
     proc loadIntoSlaveInterpreter {slave args} {
@@ -877,7 +878,7 @@ proc tcltest::DebugPArray {level arrayvar} {
     variable debug
 
     if {$debug >= $level} {
-	catch {upvar  $arrayvar $arrayvar}
+	catch {upvar 1 $arrayvar $arrayvar}
 	parray $arrayvar
     }
     return
@@ -961,8 +962,7 @@ proc tcltest::testConstraint {constraint {value ""}} {
     if {[catch {expr {$value && $value}} msg]} {
 	return -code error $msg
     }
-    if {[limitConstraints] 
-	    && [lsearch -exact $Option(-constraints) $constraint] == -1} {
+    if {[limitConstraints] && ($constraint ni $Option(-constraints))} {
 	set value 0
     }
     set testConstraints($constraint) $value
@@ -986,11 +986,7 @@ proc tcltest::interpreter { {interp ""} } {
     if {[llength [info level 0]] == 1} {
 	return $tcltest
     }
-    if {[string equal {} $interp]} {
-	set tcltest {}
-    } else {
-	set tcltest $interp
-    }
+    set tcltest $interp
 }
 
 #####################################################################
@@ -1055,7 +1051,7 @@ proc tcltest::PrintError {errorMsg} {
 		[expr {80 - $InitialMsgLen}]]]
 	puts [errorChannel] [string range $errorMsg 0 $beginningIndex]
 
-	while {![string equal end $beginningIndex]} {
+	while {$beginningIndex ne "end"} {
 	    puts -nonewline [errorChannel] \
 		    [string repeat " " $InitialMsgLen]
 	    if {($endingIndex - $beginningIndex)
@@ -1108,7 +1104,7 @@ proc tcltest::PrintError {errorMsg} {
 proc tcltest::SafeFetch {n1 n2 op} {
     variable testConstraints
     DebugPuts 3 "entering SafeFetch $n1 $n2 $op"
-    if {[string equal {} $n2]} {return}
+    if {$n2 eq {}} {return}
     if {![info exists testConstraints($n2)]} {
 	if {[catch {testConstraint $n2 [eval [ConstraintInitializer $n2]]}]} {
 	    testConstraint $n2 0
@@ -1253,9 +1249,8 @@ proc tcltest::DefineConstraintInitializers {} {
     # are running as root on Unix.
 
     ConstraintInitializer root {expr \
-	    {[string equal unix $::tcl_platform(platform)]
-	    && ([string equal root $::tcl_platform(user)]
-		|| [string equal "" $::tcl_platform(user)])}}
+	    {($::tcl_platform(platform) eq "unix") &&
+		    ($::tcl_platform(user) in {root {}})}}
     ConstraintInitializer notRoot {expr {![testConstraint root]}}
 
     # Set nonBlockFiles constraint: 1 means this platform supports
@@ -1263,7 +1258,7 @@ proc tcltest::DefineConstraintInitializers {} {
 
     ConstraintInitializer nonBlockFiles {
 	    set code [expr {[catch {set f [open defs r]}] 
-		    || [catch {fconfigure $f -blocking off}]}]
+		    || [catch {chan configure $f -blocking off}]}]
 	    catch {close $f}
 	    set code
     }
@@ -1289,10 +1284,10 @@ proc tcltest::DefineConstraintInitializers {} {
 
     ConstraintInitializer unixExecs {
 	set code 1
-        if {[string equal macintosh $::tcl_platform(platform)]} {
+        if {$::tcl_platform(platform) eq "macintosh"} {
 	    set code 0
         }
-        if {[string equal windows $::tcl_platform(platform)]} {
+        if {$::tcl_platform(platform) eq "windows"} {
 	    if {[catch {
 	        set file _tcl_test_remove_me.txt
 	        makeFile {hello} $file
@@ -1386,7 +1381,7 @@ proc tcltest::Usage { {option ""} } {
 	set allOpts [concat -help [Configure]]
 	foreach opt $allOpts {
 	    set foo [Usage $opt]
-	    foreach [list x type($opt) usage($opt)] $foo break
+	    lassign $foo x type($opt) usage($opt)
 	    set line($opt) "  $opt $type($opt)  "
 	    set length($opt) [string length $line($opt)]
 	    if {$length($opt) > $max} {set max $length($opt)}
@@ -1410,7 +1405,7 @@ proc tcltest::Usage { {option ""} } {
 	    append msg $u
 	}
 	return $msg\n
-    } elseif {[string equal -help $option]} {
+    } elseif {$option eq "-help"} {
 	return [list -help "" "Display this usage information."]
     } else {
 	set type [lindex [info args $Verify($option)] 0]
@@ -1436,7 +1431,7 @@ proc tcltest::Usage { {option ""} } {
 
 proc tcltest::ProcessFlags {flagArray} {
     # Process -help first
-    if {[lsearch -exact $flagArray {-help}] != -1} {
+    if {"-help" in $flagArray} {
 	PrintUsageInfo
 	exit 1
     }
@@ -1445,14 +1440,14 @@ proc tcltest::ProcessFlags {flagArray} {
 	RemoveAutoConfigureTraces
     } else {
 	set args $flagArray
-	while {[llength $args]>1 && [catch {configure {*}$args} msg]} {
+	while {[llength $args] > 1 && [catch {configure {*}$args} msg]} {
 
 	    # Something went wrong parsing $args for tcltest options
 	    # Check whether the problem is "unknown option"
 	    if {[regexp {^unknown option (\S+):} $msg -> option]} {
 		# Could be this is an option the Hook knows about
 		set moreOptions [processCmdLineArgsAddFlagsHook]
-		if {[lsearch -exact $moreOptions $option] == -1} {
+		if {$option ni $moreOptions} {
 		    # Nope.  Report the error, including additional options,
 		    # but keep going
 		    if {[llength $moreOptions]} {
@@ -1471,7 +1466,7 @@ proc tcltest::ProcessFlags {flagArray} {
 
 	    # To recover, find that unknown option and remove up to it.
 	    # then retry
-	    while {![string equal [lindex $args 0] $option]} {
+	    while {[lindex $args 0] ne $option} {
 		set args [lrange $args 2 end]
 	    }
 	    set args [lrange $args 2 end]
@@ -1577,7 +1572,7 @@ proc tcltest::Replace::puts {args} {
 	}
 	2 {
 	    # Either -nonewline or channelId has been specified
-	    if {[string equal -nonewline [lindex $args 0]]} {
+	    if {[lindex $args 0] eq "-nonewline"} {
 		append outData [lindex $args end]
 		return
 		# return [Puts -nonewline [lindex $args end]]
@@ -1587,7 +1582,7 @@ proc tcltest::Replace::puts {args} {
 	    }
 	}
 	3 {
-	    if {[string equal -nonewline [lindex $args 0]]} {
+	    if {[lindex $args 0] eq "-nonewline"} {
 		# Both -nonewline and channelId are specified, unless
 		# it's an error.  -nonewline is supposed to be argv[0].
 		set channel [lindex $args 1]
@@ -1597,12 +1592,10 @@ proc tcltest::Replace::puts {args} {
     }
 
     if {[info exists channel]} {
-	if {[string equal $channel [[namespace parent]::outputChannel]]
-		|| [string equal $channel stdout]} {
+	if {$channel in [list [[namespace parent]::outputChannel] stdout]} {
 	    append outData [lindex $args end]$newline
 	    return
-	} elseif {[string equal $channel [[namespace parent]::errorChannel]]
-		|| [string equal $channel stderr]} {
+	} elseif {$channel in [list [[namespace parent]::errorChannel] stderr]} {
 	    append errData [lindex $args end]$newline
 	    return
 	}
@@ -1771,7 +1764,7 @@ proc tcltest::SubstArguments {argList} {
             set argList {}
         }
 
-        if {$token != {}} {
+        if {$token ne {}} {
             # If we saw a word with quote before, then there is a
             # multi-word token starting with that word.  In this case,
             # add the text and the current word to this token.
@@ -1878,10 +1871,7 @@ proc tcltest::test {name description args} {
     # Pre-define everything to null except output and errorOutput.  We
     # determine whether or not to trap output based on whether or not
     # these variables (output & errorOutput) are defined.
-    foreach item {constraints setup cleanup body result returnCodes
-	    match} {
-	set $item {}
-    }
+    lassign {} constraints setup cleanup body result returnCodes match
 
     # Set the default match mode
     set match exact
@@ -1893,8 +1883,7 @@ proc tcltest::test {name description args} {
 
     # The old test format can't have a 3rd argument (constraints or
     # script) that starts with '-'.
-    if {[string match -* [lindex $args 0]]
-	    || ([llength $args] <= 1)} {
+    if {[string match -* [lindex $args 0]] || ([llength $args] <= 1)} {
 	if {[llength $args] == 1} {
 	    set list [SubstArguments [lindex $args 0]]
 	    foreach {element value} $list {
@@ -1915,7 +1904,7 @@ proc tcltest::test {name description args} {
 		-match -output -errorOutput -constraints}
 
 	foreach flag [array names testAttributes] {
-	    if {[lsearch -exact $validFlags $flag] == -1} {
+	    if {$flag ni $validFlags} {
 		incr testLevel -1
 		set sorted [lsort $validFlags]
 		set options [join [lrange $sorted 0 end-1] ", "]
@@ -1931,7 +1920,7 @@ proc tcltest::test {name description args} {
 
 	# Check the values supplied for -match
 	variable CustomMatch
-	if {[lsearch [array names CustomMatch] $match] == -1} {
+	if {$match ni [array names CustomMatch]} {
 	    incr testLevel -1
 	    set sorted [lsort [array names CustomMatch]]
 	    set values [join [lrange $sorted 0 end-1] ", "]
@@ -1995,7 +1984,7 @@ proc tcltest::test {name description args} {
 	} else {
 	    set testResult [uplevel 1 [list [namespace origin Eval] $command 1]]
 	}
-	foreach {actualAnswer returnCode} $testResult break
+	lassign $testResult actualAnswer returnCode
 	if {$returnCode == 1} {
 	    set errorInfo(body) $::errorInfo
 	    set errorCode(body) $::errorCode
@@ -2031,11 +2020,11 @@ proc tcltest::test {name description args} {
 	    if {([preserveCore] > 1) && ($coreFailure)} {
 		append coreMsg "\nMoving file to:\
 		    [file join [temporaryDirectory] core-$name]"
-		catch {file rename -force \
+		catch {file rename -force -- \
 		    [file join [workingDirectory] core] \
 		    [file join [temporaryDirectory] core-$name]
 		} msg
-		if {[string length $msg] > 0} {
+		if {$msg ne {}} {
 		    append coreMsg "\nError:\
 			Problem renaming core file: $msg"
 		}
@@ -2045,7 +2034,7 @@ proc tcltest::test {name description args} {
 
     # check if the return code matched the expected return code
     set codeFailure 0
-    if {!$setupFailure && [lsearch -exact $returnCodes $returnCode] == -1} {
+    if {!$setupFailure && ($returnCode ni $returnCodes)} {
 	set codeFailure 1
     }
 
@@ -2124,7 +2113,7 @@ proc tcltest::test {name description args} {
 		set testFd [open $testFile r]
 		set testLine [expr {[lsearch -regexp \
 			[split [read $testFd] "\n"] \
-			"^\[ \t\]*test [string map {. \\.} $name] "]+1}]
+			"^\[ \t\]*test [string map {. \\.} $name] "] + 1}]
 		close $testFd
 	    }
 	}
@@ -2169,7 +2158,7 @@ proc tcltest::test {name description args} {
 	puts [outputChannel] "---- Return code should have been\
 		one of: $returnCodes"
 	if {[IsVerbose error]} {
-	    if {[info exists errorInfo(body)] && ([lsearch $returnCodes 1]<0)} {
+	    if {[info exists errorInfo(body)] && (1 ni $returnCodes)} {
 		puts [outputChannel] "---- errorInfo: $errorInfo(body)"
 		puts [outputChannel] "---- errorCode: $errorCode(body)"
 	    }
@@ -2250,7 +2239,7 @@ proc tcltest::Skipped {name constraints} {
 	}
 	return 1
     }
-    if {[string equal {} $constraints]} {
+    if {$constraints eq {}} {
 	# If we're limited to the listed constraints and there aren't
 	# any listed, then we shouldn't run the test.
 	if {[limitConstraints]} {
@@ -2401,7 +2390,7 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
 	foreach file $filesMade {
 	    if {[file exists $file]} {
 		DebugDo 1 {Warn "cleanupTests deleting $file..."}
-		catch {file delete -force $file}
+		catch {file delete -force -- $file}
 	    }
 	}
 	set currentFiles {}
@@ -2411,7 +2400,7 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
 	}
 	set newFiles {}
 	foreach file $currentFiles {
-	    if {[lsearch -exact $filesExisted $file] == -1} {
+	    if {$file ni $filesExisted} {
 		lappend newFiles $file
 	    }
 	}
@@ -2494,8 +2483,7 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
 	# then add current file to failFile list if any tests in this
 	# file failed
 
-	if {$currentFailure \
-		&& ([lsearch -exact $failFiles $testFileName] == -1)} {
+	if {$currentFailure && ($testFileName ni $failFiles)} {
 	    lappend failFiles $testFileName
 	}
 	set currentFailure false
@@ -2555,11 +2543,11 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
 		puts [outputChannel] "produced core file! \
 			Moving file to: \
 			[file join [temporaryDirectory] core-$testFileName]"
-		catch {file rename -force \
+		catch {file rename -force -- \
 			[file join [workingDirectory] core] \
 			[file join [temporaryDirectory] core-$testFileName]
 		} msg
-		if {[string length $msg] > 0} {
+		if {$msg ne {}} {
 		    PrintError "Problem renaming file: $msg"
 		}
 	    } else {
@@ -2637,7 +2625,7 @@ proc tcltest::GetMatchingFiles { args } {
 
 	# Add to result list all files in match list and not in skip list
 	foreach file $matchFileList {
-	    if {[lsearch -exact $skipFileList $file] == -1} {
+	    if {$file ni $skipFileList} {
 		lappend matchingFiles $file
 	    }
 	}
@@ -2684,7 +2672,7 @@ proc tcltest::GetMatchingDirectories {rootdir} {
     foreach pattern [matchDirectories] {
 	foreach path [glob -directory $rootdir -types d -nocomplain -- \
 		$pattern] {
-	    if {[lsearch -exact $skipDirs $path] == -1} {
+	    if {$path ni $skipDirs} {
 		set matchDirs [concat $matchDirs [GetMatchingDirectories $path]]
 		if {[file exists [file join $path all.tcl]]} {
 		    lappend matchDirs $path
@@ -2737,7 +2725,7 @@ proc tcltest::runAllTests { {shell ""} } {
 
     # [file system] first available in Tcl 8.4
     if {![catch {file system [testsDirectory]} result]
-	    && ![string equal native [lindex $result 0]]} {
+	    && ([lindex $result 0] ne "native")} {
 	# If we aren't running in the native filesystem, then we must
 	# run the tests in a single process (via 'source'), because
 	# trying to run then via a pipe will fail since the files don't
@@ -2784,10 +2772,10 @@ proc tcltest::runAllTests { {shell ""} } {
 	    # needs to read and process output of children.
 	    set childargv [list]
 	    foreach opt [Configure] {
-		if {[string equal $opt -outfile]} {continue}
+		if {$opt eq "-outfile"} {continue}
 		set value [Configure $opt]
 		# Don't bother passing default configuration options
-		if {[string equal $value $DefaultValue($opt)]} {
+		if {$value eq $DefaultValue($opt)} {
 			continue
 		}
 		lappend childargv $opt $value
@@ -2880,11 +2868,6 @@ proc tcltest::runAllTests { {shell ""} } {
 #     none.
 
 proc tcltest::loadTestedCommands {} {
-    variable l
-    if {[string equal {} [loadScript]]} {
-	return
-    }
-
     return [uplevel 1 [loadScript]]
 }
 
@@ -2927,16 +2910,15 @@ proc tcltest::saveState {} {
 proc tcltest::restoreState {} {
     variable saveState
     foreach p [uplevel 1 {::info procs}] {
-	if {([lsearch [lindex $saveState 0] $p] < 0)
-		&& ![string equal [namespace current]::$p \
-		[uplevel 1 [list ::namespace origin $p]]]} {
+	if {($p ni [lindex $saveState 0]) && ("[namespace current]::$p" ne
+		[uplevel 1 [list ::namespace origin $p]])} {
 
 	    DebugPuts 2 "[lindex [info level 0] 0]: Removing proc $p"
 	    uplevel 1 [list ::catch [list ::rename $p {}]]
 	}
     }
     foreach p [uplevel 1 {::info vars}] {
-	if {[lsearch [lindex $saveState 1] $p] < 0} {
+	if {$p ni [lindex $saveState 1]} {
 	    DebugPuts 2 "[lindex [info level 0] 0]:\
 		    Removing variable $p"
 	    uplevel 1 [list ::catch [list ::unset $p]]
@@ -2997,15 +2979,15 @@ proc tcltest::makeFile {contents name {directory ""}} {
 	     putting ``$contents'' into $fullName"
 
     set fd [open $fullName w]
-    fconfigure $fd -translation lf
-    if {[string equal [string index $contents end] \n]} {
+    chan configure $fd -translation lf
+    if {[string index $contents end] eq "\n"} {
 	puts -nonewline $fd $contents
     } else {
 	puts $fd $contents
     }
     close $fd
 
-    if {[lsearch -exact $filesMade $fullName] == -1} {
+    if {$fullName ni $filesMade} {
 	lappend filesMade $fullName
     }
     return $fullName
@@ -3045,7 +3027,7 @@ proc tcltest::removeFile {name {directory ""}} {
 	    Warn "removeFile removing \"$fullName\":\n  not a file"
 	}
     }
-    return [file delete $fullName]
+    return [file delete -- $fullName]
 }
 
 # tcltest::makeDirectory --
@@ -3075,7 +3057,7 @@ proc tcltest::makeDirectory {name {directory ""}} {
     set fullName [file join $directory $name]
     DebugPuts 3 "[lindex [info level 0] 0]: creating $fullName"
     file mkdir $fullName
-    if {[lsearch -exact $filesMade $fullName] == -1} {
+    if {$fullName ni $filesMade} {
 	lappend filesMade $fullName
     }
     return $fullName
@@ -3116,7 +3098,7 @@ proc tcltest::removeDirectory {name {directory ""}} {
 	    Warn "removeDirectory removing \"$fullName\":\n  not a directory"
 	}
     }
-    return [file delete -force $fullName]
+    return [file delete -force -- $fullName]
 }
 
 # tcltest::viewFile --
@@ -3213,7 +3195,7 @@ proc tcltest::LeakFiles {old} {
     }
     set leak {}
     foreach p $new {
-	if {[lsearch $old $p] < 0} {
+	if {$p ni $old} {
 	    lappend leak $p
 	}
     }
@@ -3284,7 +3266,7 @@ proc tcltest::RestoreLocale {} {
 #
 
 proc tcltest::threadReap {} {
-    if {[info commands testthread] != {}} {
+    if {[info commands testthread] ne {}} {
 
 	# testthread built into tcltest
 
@@ -3304,7 +3286,7 @@ proc tcltest::threadReap {} {
 	}
 	testthread errorproc ThreadError
 	return [llength [testthread names]]
-    } elseif {[info commands thread::id] != {}} {
+    } elseif {[info commands thread::id] ne {}} {
 	
 	# Thread extension
 
@@ -3336,15 +3318,15 @@ namespace eval tcltest {
     # Set up the constraints in the testConstraints array to be lazily
     # initialized by a registered initializer, or by "false" if no
     # initializer is registered.
-    trace variable testConstraints r [namespace code SafeFetch]
+    trace add variable testConstraints read [namespace code SafeFetch]
 
     # Only initialize constraints at package load time if an
     # [initConstraintsHook] has been pre-defined.  This is only
     # for compatibility support.  The modern way to add a custom
     # test constraint is to just call the [testConstraint] command
     # straight away, without all this "hook" nonsense.
-    if {[string equal [namespace current] \
-	    [namespace qualifiers [namespace which initConstraintsHook]]]} {
+    if {[namespace current] eq
+	    [namespace qualifiers [namespace which initConstraintsHook]]} {
 	InitConstraints
     } else {
 	proc initConstraintsHook {} {}
@@ -3381,15 +3363,15 @@ namespace eval tcltest {
 
     proc LoadTimeCmdLineArgParsingRequired {} {
 	set required false
-	if {[info exists ::argv] && [lsearch -exact $::argv -help] != -1} {
+	if {[info exists ::argv] && ("-help" in $::argv)} {
 	    # The command line asks for -help, so give it (and exit)
 	    # right now.  ([configure] does not process -help)
 	    set required true
 	}
 	foreach hook { PrintUsageInfoHook processCmdLineArgsHook
 			processCmdLineArgsAddFlagsHook } {
-	    if {[string equal [namespace current] [namespace qualifiers \
-		    [namespace which $hook]]]} {
+	    if {[namespace current] eq
+		    [namespace qualifiers [namespace which $hook]]} {
 		set required true
 	    } else {
 		proc $hook args {}
diff --git a/library/tm.tcl b/library/tm.tcl
index ce8a013..d2af4f5 100644
--- a/library/tm.tcl
+++ b/library/tm.tcl
@@ -54,7 +54,7 @@ namespace eval ::tcl::tm {
     # Export the public API
 
     namespace export path
-    namespace ensemble create -command path -subcommand {add remove list}
+    namespace ensemble create -command path -subcommands {add remove list}
 }
 
 # ::tcl::tm::path implementations --
@@ -260,10 +260,8 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 		    # Otherwise we still have to fallback to the regular
 		    # package search to complete the processing.
 
-		    if {
-			($pkgname eq $name) &&
-			[package vsatisfies $pkgversion {*}$args]
-		    } then {
+		    if {($pkgname eq $name)
+			    && [package vsatisfies $pkgversion {*}$args]} {
 			set satisfied 1
 
 			# We do not abort the loop, and keep adding provide
@@ -347,7 +345,7 @@ proc ::tcl::tm::Defaults {} {
 #	Calls 'path add' to paths to the list of module search paths.
 
 proc ::tcl::tm::roots {paths} {
-    foreach {major minor} [split [info tclversion] .] break
+    lassign [split [package present Tcl] .] major minor
     foreach pa $paths {
 	set p [file join $pa tcl$major]
 	for {set n $minor} {$n >= 0} {incr n -1} {
diff --git a/library/tzdata/Africa/Cairo b/library/tzdata/Africa/Cairo
index 165d8c4..842b7b2 100644
--- a/library/tzdata/Africa/Cairo
+++ b/library/tzdata/Africa/Cairo
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Africa/Cairo) {
-    {-9223372036854775808 7500 0 LMT}
-    {-2185409100 7200 0 EET}
+    {-9223372036854775808 7509 0 LMT}
+    {-2185409109 7200 0 EET}
     {-929844000 10800 1 EEST}
     {-923108400 7200 0 EET}
     {-906170400 10800 1 EEST}
diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index 41f8742..757007c 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -34,24 +34,38 @@ set TZData(:Africa/Casablanca) {
     {1345428000 3600 1 WEST}
     {1348970400 0 0 WET}
     {1367114400 3600 1 WEST}
+    {1373162400 0 0 WET}
+    {1376100000 3600 1 WEST}
     {1380420000 0 0 WET}
     {1398564000 3600 1 WEST}
+    {1404007200 0 0 WET}
+    {1406599200 3600 1 WEST}
     {1411869600 0 0 WET}
     {1430013600 3600 1 WEST}
+    {1434592800 0 0 WET}
+    {1437184800 3600 1 WEST}
     {1443319200 0 0 WET}
     {1461463200 3600 1 WEST}
+    {1465264800 0 0 WET}
+    {1467856800 3600 1 WEST}
     {1474768800 0 0 WET}
     {1493517600 3600 1 WEST}
+    {1495850400 0 0 WET}
+    {1498442400 3600 1 WEST}
     {1506218400 0 0 WET}
     {1524967200 3600 1 WEST}
+    {1526436000 0 0 WET}
+    {1529028000 3600 1 WEST}
     {1538272800 0 0 WET}
     {1556416800 3600 1 WEST}
+    {1557108000 0 0 WET}
+    {1559700000 3600 1 WEST}
     {1569722400 0 0 WET}
-    {1587866400 3600 1 WEST}
+    {1590285600 3600 1 WEST}
     {1601172000 0 0 WET}
-    {1619316000 3600 1 WEST}
+    {1620871200 3600 1 WEST}
     {1632621600 0 0 WET}
-    {1650765600 3600 1 WEST}
+    {1651543200 3600 1 WEST}
     {1664071200 0 0 WET}
     {1682820000 3600 1 WEST}
     {1695520800 0 0 WET}
diff --git a/library/tzdata/Africa/Gaborone b/library/tzdata/Africa/Gaborone
index 7753ba0..bd38673 100644
--- a/library/tzdata/Africa/Gaborone
+++ b/library/tzdata/Africa/Gaborone
@@ -2,7 +2,8 @@
 
 set TZData(:Africa/Gaborone) {
     {-9223372036854775808 6220 0 LMT}
-    {-2682294220 7200 0 CAT}
+    {-2682294220 5400 0 SAST}
+    {-2109288600 7200 0 CAT}
     {-829526400 10800 1 CAST}
     {-813805200 7200 0 CAT}
 }
diff --git a/library/tzdata/Africa/Tripoli b/library/tzdata/Africa/Tripoli
index e993249..ac78218 100644
--- a/library/tzdata/Africa/Tripoli
+++ b/library/tzdata/Africa/Tripoli
@@ -27,5 +27,180 @@ set TZData(:Africa/Tripoli) {
     {641775600 7200 0 EET}
     {844034400 3600 0 CET}
     {860108400 7200 1 CEST}
-    {875916000 7200 0 EET}
+    {875919600 7200 0 EET}
+    {1352505600 3600 0 CET}
+    {1364515200 7200 1 CEST}
+    {1382659200 3600 0 CET}
+    {1395964800 7200 1 CEST}
+    {1414713600 3600 0 CET}
+    {1427414400 7200 1 CEST}
+    {1446163200 3600 0 CET}
+    {1458864000 7200 1 CEST}
+    {1477612800 3600 0 CET}
+    {1490918400 7200 1 CEST}
+    {1509062400 3600 0 CET}
+    {1522368000 7200 1 CEST}
+    {1540512000 3600 0 CET}
+    {1553817600 7200 1 CEST}
+    {1571961600 3600 0 CET}
+    {1585267200 7200 1 CEST}
+    {1604016000 3600 0 CET}
+    {1616716800 7200 1 CEST}
+    {1635465600 3600 0 CET}
+    {1648166400 7200 1 CEST}
+    {1666915200 3600 0 CET}
+    {1680220800 7200 1 CEST}
+    {1698364800 3600 0 CET}
+    {1711670400 7200 1 CEST}
+    {1729814400 3600 0 CET}
+    {1743120000 7200 1 CEST}
+    {1761868800 3600 0 CET}
+    {1774569600 7200 1 CEST}
+    {1793318400 3600 0 CET}
+    {1806019200 7200 1 CEST}
+    {1824768000 3600 0 CET}
+    {1838073600 7200 1 CEST}
+    {1856217600 3600 0 CET}
+    {1869523200 7200 1 CEST}
+    {1887667200 3600 0 CET}
+    {1900972800 7200 1 CEST}
+    {1919116800 3600 0 CET}
+    {1932422400 7200 1 CEST}
+    {1951171200 3600 0 CET}
+    {1963872000 7200 1 CEST}
+    {1982620800 3600 0 CET}
+    {1995321600 7200 1 CEST}
+    {2014070400 3600 0 CET}
+    {2027376000 7200 1 CEST}
+    {2045520000 3600 0 CET}
+    {2058825600 7200 1 CEST}
+    {2076969600 3600 0 CET}
+    {2090275200 7200 1 CEST}
+    {2109024000 3600 0 CET}
+    {2121724800 7200 1 CEST}
+    {2140473600 3600 0 CET}
+    {2153174400 7200 1 CEST}
+    {2171923200 3600 0 CET}
+    {2184624000 7200 1 CEST}
+    {2203372800 3600 0 CET}
+    {2216678400 7200 1 CEST}
+    {2234822400 3600 0 CET}
+    {2248128000 7200 1 CEST}
+    {2266272000 3600 0 CET}
+    {2279577600 7200 1 CEST}
+    {2298326400 3600 0 CET}
+    {2311027200 7200 1 CEST}
+    {2329776000 3600 0 CET}
+    {2342476800 7200 1 CEST}
+    {2361225600 3600 0 CET}
+    {2374531200 7200 1 CEST}
+    {2392675200 3600 0 CET}
+    {2405980800 7200 1 CEST}
+    {2424124800 3600 0 CET}
+    {2437430400 7200 1 CEST}
+    {2455574400 3600 0 CET}
+    {2468880000 7200 1 CEST}
+    {2487628800 3600 0 CET}
+    {2500329600 7200 1 CEST}
+    {2519078400 3600 0 CET}
+    {2531779200 7200 1 CEST}
+    {2550528000 3600 0 CET}
+    {2563833600 7200 1 CEST}
+    {2581977600 3600 0 CET}
+    {2595283200 7200 1 CEST}
+    {2613427200 3600 0 CET}
+    {2626732800 7200 1 CEST}
+    {2645481600 3600 0 CET}
+    {2658182400 7200 1 CEST}
+    {2676931200 3600 0 CET}
+    {2689632000 7200 1 CEST}
+    {2708380800 3600 0 CET}
+    {2721686400 7200 1 CEST}
+    {2739830400 3600 0 CET}
+    {2753136000 7200 1 CEST}
+    {2771280000 3600 0 CET}
+    {2784585600 7200 1 CEST}
+    {2802729600 3600 0 CET}
+    {2816035200 7200 1 CEST}
+    {2834784000 3600 0 CET}
+    {2847484800 7200 1 CEST}
+    {2866233600 3600 0 CET}
+    {2878934400 7200 1 CEST}
+    {2897683200 3600 0 CET}
+    {2910988800 7200 1 CEST}
+    {2929132800 3600 0 CET}
+    {2942438400 7200 1 CEST}
+    {2960582400 3600 0 CET}
+    {2973888000 7200 1 CEST}
+    {2992636800 3600 0 CET}
+    {3005337600 7200 1 CEST}
+    {3024086400 3600 0 CET}
+    {3036787200 7200 1 CEST}
+    {3055536000 3600 0 CET}
+    {3068236800 7200 1 CEST}
+    {3086985600 3600 0 CET}
+    {3100291200 7200 1 CEST}
+    {3118435200 3600 0 CET}
+    {3131740800 7200 1 CEST}
+    {3149884800 3600 0 CET}
+    {3163190400 7200 1 CEST}
+    {3181939200 3600 0 CET}
+    {3194640000 7200 1 CEST}
+    {3213388800 3600 0 CET}
+    {3226089600 7200 1 CEST}
+    {3244838400 3600 0 CET}
+    {3258144000 7200 1 CEST}
+    {3276288000 3600 0 CET}
+    {3289593600 7200 1 CEST}
+    {3307737600 3600 0 CET}
+    {3321043200 7200 1 CEST}
+    {3339187200 3600 0 CET}
+    {3352492800 7200 1 CEST}
+    {3371241600 3600 0 CET}
+    {3383942400 7200 1 CEST}
+    {3402691200 3600 0 CET}
+    {3415392000 7200 1 CEST}
+    {3434140800 3600 0 CET}
+    {3447446400 7200 1 CEST}
+    {3465590400 3600 0 CET}
+    {3478896000 7200 1 CEST}
+    {3497040000 3600 0 CET}
+    {3510345600 7200 1 CEST}
+    {3529094400 3600 0 CET}
+    {3541795200 7200 1 CEST}
+    {3560544000 3600 0 CET}
+    {3573244800 7200 1 CEST}
+    {3591993600 3600 0 CET}
+    {3605299200 7200 1 CEST}
+    {3623443200 3600 0 CET}
+    {3636748800 7200 1 CEST}
+    {3654892800 3600 0 CET}
+    {3668198400 7200 1 CEST}
+    {3686342400 3600 0 CET}
+    {3699648000 7200 1 CEST}
+    {3718396800 3600 0 CET}
+    {3731097600 7200 1 CEST}
+    {3749846400 3600 0 CET}
+    {3762547200 7200 1 CEST}
+    {3781296000 3600 0 CET}
+    {3794601600 7200 1 CEST}
+    {3812745600 3600 0 CET}
+    {3826051200 7200 1 CEST}
+    {3844195200 3600 0 CET}
+    {3857500800 7200 1 CEST}
+    {3876249600 3600 0 CET}
+    {3888950400 7200 1 CEST}
+    {3907699200 3600 0 CET}
+    {3920400000 7200 1 CEST}
+    {3939148800 3600 0 CET}
+    {3951849600 7200 1 CEST}
+    {3970598400 3600 0 CET}
+    {3983904000 7200 1 CEST}
+    {4002048000 3600 0 CET}
+    {4015353600 7200 1 CEST}
+    {4033497600 3600 0 CET}
+    {4046803200 7200 1 CEST}
+    {4065552000 3600 0 CET}
+    {4078252800 7200 1 CEST}
+    {4097001600 3600 0 CET}
 }
diff --git a/library/tzdata/America/Asuncion b/library/tzdata/America/Asuncion
index 14bbab2..9ea30da 100644
--- a/library/tzdata/America/Asuncion
+++ b/library/tzdata/America/Asuncion
@@ -82,178 +82,178 @@ set TZData(:America/Asuncion) {
     {1317528000 -10800 1 PYST}
     {1333854000 -14400 0 PYT}
     {1349582400 -10800 1 PYST}
-    {1365908400 -14400 0 PYT}
+    {1364094000 -14400 0 PYT}
     {1381032000 -10800 1 PYST}
-    {1397358000 -14400 0 PYT}
+    {1395543600 -14400 0 PYT}
     {1412481600 -10800 1 PYST}
-    {1428807600 -14400 0 PYT}
+    {1426993200 -14400 0 PYT}
     {1443931200 -10800 1 PYST}
-    {1460257200 -14400 0 PYT}
+    {1459047600 -14400 0 PYT}
     {1475380800 -10800 1 PYST}
-    {1491706800 -14400 0 PYT}
+    {1490497200 -14400 0 PYT}
     {1506830400 -10800 1 PYST}
-    {1523156400 -14400 0 PYT}
+    {1521946800 -14400 0 PYT}
     {1538884800 -10800 1 PYST}
-    {1555210800 -14400 0 PYT}
+    {1553396400 -14400 0 PYT}
     {1570334400 -10800 1 PYST}
-    {1586660400 -14400 0 PYT}
+    {1584846000 -14400 0 PYT}
     {1601784000 -10800 1 PYST}
-    {1618110000 -14400 0 PYT}
+    {1616900400 -14400 0 PYT}
     {1633233600 -10800 1 PYST}
-    {1649559600 -14400 0 PYT}
+    {1648350000 -14400 0 PYT}
     {1664683200 -10800 1 PYST}
-    {1681009200 -14400 0 PYT}
+    {1679799600 -14400 0 PYT}
     {1696132800 -10800 1 PYST}
-    {1713063600 -14400 0 PYT}
+    {1711249200 -14400 0 PYT}
     {1728187200 -10800 1 PYST}
-    {1744513200 -14400 0 PYT}
+    {1742698800 -14400 0 PYT}
     {1759636800 -10800 1 PYST}
-    {1775962800 -14400 0 PYT}
+    {1774148400 -14400 0 PYT}
     {1791086400 -10800 1 PYST}
-    {1807412400 -14400 0 PYT}
+    {1806202800 -14400 0 PYT}
     {1822536000 -10800 1 PYST}
-    {1838862000 -14400 0 PYT}
+    {1837652400 -14400 0 PYT}
     {1853985600 -10800 1 PYST}
-    {1870311600 -14400 0 PYT}
+    {1869102000 -14400 0 PYT}
     {1886040000 -10800 1 PYST}
-    {1902366000 -14400 0 PYT}
+    {1900551600 -14400 0 PYT}
     {1917489600 -10800 1 PYST}
-    {1933815600 -14400 0 PYT}
+    {1932001200 -14400 0 PYT}
     {1948939200 -10800 1 PYST}
-    {1965265200 -14400 0 PYT}
+    {1964055600 -14400 0 PYT}
     {1980388800 -10800 1 PYST}
-    {1996714800 -14400 0 PYT}
+    {1995505200 -14400 0 PYT}
     {2011838400 -10800 1 PYST}
-    {2028164400 -14400 0 PYT}
+    {2026954800 -14400 0 PYT}
     {2043288000 -10800 1 PYST}
-    {2059614000 -14400 0 PYT}
+    {2058404400 -14400 0 PYT}
     {2075342400 -10800 1 PYST}
-    {2091668400 -14400 0 PYT}
+    {2089854000 -14400 0 PYT}
     {2106792000 -10800 1 PYST}
-    {2123118000 -14400 0 PYT}
+    {2121303600 -14400 0 PYT}
     {2138241600 -10800 1 PYST}
-    {2154567600 -14400 0 PYT}
+    {2153358000 -14400 0 PYT}
     {2169691200 -10800 1 PYST}
-    {2186017200 -14400 0 PYT}
+    {2184807600 -14400 0 PYT}
     {2201140800 -10800 1 PYST}
-    {2217466800 -14400 0 PYT}
+    {2216257200 -14400 0 PYT}
     {2233195200 -10800 1 PYST}
-    {2249521200 -14400 0 PYT}
+    {2247706800 -14400 0 PYT}
     {2264644800 -10800 1 PYST}
-    {2280970800 -14400 0 PYT}
+    {2279156400 -14400 0 PYT}
     {2296094400 -10800 1 PYST}
-    {2312420400 -14400 0 PYT}
+    {2310606000 -14400 0 PYT}
     {2327544000 -10800 1 PYST}
-    {2343870000 -14400 0 PYT}
+    {2342660400 -14400 0 PYT}
     {2358993600 -10800 1 PYST}
-    {2375319600 -14400 0 PYT}
+    {2374110000 -14400 0 PYT}
     {2390443200 -10800 1 PYST}
-    {2406769200 -14400 0 PYT}
+    {2405559600 -14400 0 PYT}
     {2422497600 -10800 1 PYST}
-    {2438823600 -14400 0 PYT}
+    {2437009200 -14400 0 PYT}
     {2453947200 -10800 1 PYST}
-    {2470273200 -14400 0 PYT}
+    {2468458800 -14400 0 PYT}
     {2485396800 -10800 1 PYST}
-    {2501722800 -14400 0 PYT}
+    {2500513200 -14400 0 PYT}
     {2516846400 -10800 1 PYST}
-    {2533172400 -14400 0 PYT}
+    {2531962800 -14400 0 PYT}
     {2548296000 -10800 1 PYST}
-    {2564622000 -14400 0 PYT}
+    {2563412400 -14400 0 PYT}
     {2579745600 -10800 1 PYST}
-    {2596676400 -14400 0 PYT}
+    {2594862000 -14400 0 PYT}
     {2611800000 -10800 1 PYST}
-    {2628126000 -14400 0 PYT}
+    {2626311600 -14400 0 PYT}
     {2643249600 -10800 1 PYST}
-    {2659575600 -14400 0 PYT}
+    {2657761200 -14400 0 PYT}
     {2674699200 -10800 1 PYST}
-    {2691025200 -14400 0 PYT}
+    {2689815600 -14400 0 PYT}
     {2706148800 -10800 1 PYST}
-    {2722474800 -14400 0 PYT}
+    {2721265200 -14400 0 PYT}
     {2737598400 -10800 1 PYST}
-    {2753924400 -14400 0 PYT}
+    {2752714800 -14400 0 PYT}
     {2769652800 -10800 1 PYST}
-    {2785978800 -14400 0 PYT}
+    {2784164400 -14400 0 PYT}
     {2801102400 -10800 1 PYST}
-    {2817428400 -14400 0 PYT}
+    {2815614000 -14400 0 PYT}
     {2832552000 -10800 1 PYST}
-    {2848878000 -14400 0 PYT}
+    {2847668400 -14400 0 PYT}
     {2864001600 -10800 1 PYST}
-    {2880327600 -14400 0 PYT}
+    {2879118000 -14400 0 PYT}
     {2895451200 -10800 1 PYST}
-    {2911777200 -14400 0 PYT}
+    {2910567600 -14400 0 PYT}
     {2926900800 -10800 1 PYST}
-    {2943226800 -14400 0 PYT}
+    {2942017200 -14400 0 PYT}
     {2958955200 -10800 1 PYST}
-    {2975281200 -14400 0 PYT}
+    {2973466800 -14400 0 PYT}
     {2990404800 -10800 1 PYST}
-    {3006730800 -14400 0 PYT}
+    {3004916400 -14400 0 PYT}
     {3021854400 -10800 1 PYST}
-    {3038180400 -14400 0 PYT}
+    {3036970800 -14400 0 PYT}
     {3053304000 -10800 1 PYST}
-    {3069630000 -14400 0 PYT}
+    {3068420400 -14400 0 PYT}
     {3084753600 -10800 1 PYST}
-    {3101079600 -14400 0 PYT}
+    {3099870000 -14400 0 PYT}
     {3116808000 -10800 1 PYST}
-    {3133134000 -14400 0 PYT}
+    {3131319600 -14400 0 PYT}
     {3148257600 -10800 1 PYST}
-    {3164583600 -14400 0 PYT}
+    {3162769200 -14400 0 PYT}
     {3179707200 -10800 1 PYST}
-    {3196033200 -14400 0 PYT}
+    {3194218800 -14400 0 PYT}
     {3211156800 -10800 1 PYST}
-    {3227482800 -14400 0 PYT}
+    {3226273200 -14400 0 PYT}
     {3242606400 -10800 1 PYST}
-    {3258932400 -14400 0 PYT}
+    {3257722800 -14400 0 PYT}
     {3274056000 -10800 1 PYST}
-    {3290382000 -14400 0 PYT}
+    {3289172400 -14400 0 PYT}
     {3306110400 -10800 1 PYST}
-    {3322436400 -14400 0 PYT}
+    {3320622000 -14400 0 PYT}
     {3337560000 -10800 1 PYST}
-    {3353886000 -14400 0 PYT}
+    {3352071600 -14400 0 PYT}
     {3369009600 -10800 1 PYST}
-    {3385335600 -14400 0 PYT}
+    {3384126000 -14400 0 PYT}
     {3400459200 -10800 1 PYST}
-    {3416785200 -14400 0 PYT}
+    {3415575600 -14400 0 PYT}
     {3431908800 -10800 1 PYST}
-    {3448234800 -14400 0 PYT}
+    {3447025200 -14400 0 PYT}
     {3463358400 -10800 1 PYST}
-    {3480289200 -14400 0 PYT}
+    {3478474800 -14400 0 PYT}
     {3495412800 -10800 1 PYST}
-    {3511738800 -14400 0 PYT}
+    {3509924400 -14400 0 PYT}
     {3526862400 -10800 1 PYST}
-    {3543188400 -14400 0 PYT}
+    {3541374000 -14400 0 PYT}
     {3558312000 -10800 1 PYST}
-    {3574638000 -14400 0 PYT}
+    {3573428400 -14400 0 PYT}
     {3589761600 -10800 1 PYST}
-    {3606087600 -14400 0 PYT}
+    {3604878000 -14400 0 PYT}
     {3621211200 -10800 1 PYST}
-    {3637537200 -14400 0 PYT}
+    {3636327600 -14400 0 PYT}
     {3653265600 -10800 1 PYST}
-    {3669591600 -14400 0 PYT}
+    {3667777200 -14400 0 PYT}
     {3684715200 -10800 1 PYST}
-    {3701041200 -14400 0 PYT}
+    {3699226800 -14400 0 PYT}
     {3716164800 -10800 1 PYST}
-    {3732490800 -14400 0 PYT}
+    {3731281200 -14400 0 PYT}
     {3747614400 -10800 1 PYST}
-    {3763940400 -14400 0 PYT}
+    {3762730800 -14400 0 PYT}
     {3779064000 -10800 1 PYST}
-    {3795390000 -14400 0 PYT}
+    {3794180400 -14400 0 PYT}
     {3810513600 -10800 1 PYST}
-    {3826839600 -14400 0 PYT}
+    {3825630000 -14400 0 PYT}
     {3842568000 -10800 1 PYST}
-    {3858894000 -14400 0 PYT}
+    {3857079600 -14400 0 PYT}
     {3874017600 -10800 1 PYST}
-    {3890343600 -14400 0 PYT}
+    {3888529200 -14400 0 PYT}
     {3905467200 -10800 1 PYST}
-    {3921793200 -14400 0 PYT}
+    {3920583600 -14400 0 PYT}
     {3936916800 -10800 1 PYST}
-    {3953242800 -14400 0 PYT}
+    {3952033200 -14400 0 PYT}
     {3968366400 -10800 1 PYST}
-    {3984692400 -14400 0 PYT}
+    {3983482800 -14400 0 PYT}
     {4000420800 -10800 1 PYST}
-    {4016746800 -14400 0 PYT}
+    {4014932400 -14400 0 PYT}
     {4031870400 -10800 1 PYST}
-    {4048196400 -14400 0 PYT}
+    {4046382000 -14400 0 PYT}
     {4063320000 -10800 1 PYST}
-    {4079646000 -14400 0 PYT}
+    {4077831600 -14400 0 PYT}
     {4094769600 -10800 1 PYST}
 }
diff --git a/library/tzdata/America/Barbados b/library/tzdata/America/Barbados
index 5c06408..ea17073 100644
--- a/library/tzdata/America/Barbados
+++ b/library/tzdata/America/Barbados
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Barbados) {
-    {-9223372036854775808 -14308 0 LMT}
-    {-1451678492 -14308 0 BMT}
-    {-1199217692 -14400 0 AST}
+    {-9223372036854775808 -14309 0 LMT}
+    {-1451678491 -14309 0 BMT}
+    {-1199217691 -14400 0 AST}
     {234943200 -10800 1 ADT}
     {244616400 -14400 0 AST}
     {261554400 -10800 1 ADT}
diff --git a/library/tzdata/America/Bogota b/library/tzdata/America/Bogota
index f727d17..b28abc1 100644
--- a/library/tzdata/America/Bogota
+++ b/library/tzdata/America/Bogota
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Bogota) {
-    {-9223372036854775808 -17780 0 LMT}
-    {-2707671820 -17780 0 BMT}
-    {-1739041420 -18000 0 COT}
+    {-9223372036854775808 -17776 0 LMT}
+    {-2707671824 -17776 0 BMT}
+    {-1739041424 -18000 0 COT}
     {704869200 -14400 1 COST}
     {733896000 -18000 0 COT}
 }
diff --git a/library/tzdata/America/Costa_Rica b/library/tzdata/America/Costa_Rica
index 04420a4..8fc9343 100644
--- a/library/tzdata/America/Costa_Rica
+++ b/library/tzdata/America/Costa_Rica
@@ -1,9 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Costa_Rica) {
-    {-9223372036854775808 -20180 0 LMT}
-    {-2524501420 -20180 0 SJMT}
-    {-1545071020 -21600 0 CST}
+    {-9223372036854775808 -20173 0 LMT}
+    {-2524501427 -20173 0 SJMT}
+    {-1545071027 -21600 0 CST}
     {288770400 -18000 1 CDT}
     {297234000 -21600 0 CST}
     {320220000 -18000 1 CDT}
diff --git a/library/tzdata/America/Curacao b/library/tzdata/America/Curacao
index 443a319..5189e9c 100644
--- a/library/tzdata/America/Curacao
+++ b/library/tzdata/America/Curacao
@@ -1,7 +1,7 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Curacao) {
-    {-9223372036854775808 -16544 0 LMT}
-    {-1826738656 -16200 0 ANT}
+    {-9223372036854775808 -16547 0 LMT}
+    {-1826738653 -16200 0 ANT}
     {-157750200 -14400 0 AST}
 }
diff --git a/library/tzdata/America/Nassau b/library/tzdata/America/Nassau
index 06c5f06..1c35e93 100644
--- a/library/tzdata/America/Nassau
+++ b/library/tzdata/America/Nassau
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:America/Nassau) {
-    {-9223372036854775808 -18564 0 LMT}
-    {-1825095036 -18000 0 EST}
+    {-9223372036854775808 -18570 0 LMT}
+    {-1825095030 -18000 0 EST}
     {-179341200 -14400 1 EDT}
     {-163620000 -18000 0 EST}
     {-147891600 -14400 1 EDT}
diff --git a/library/tzdata/America/Port-au-Prince b/library/tzdata/America/Port-au-Prince
index 639972b..f1d7fc4 100644
--- a/library/tzdata/America/Port-au-Prince
+++ b/library/tzdata/America/Port-au-Prince
@@ -40,4 +40,178 @@ set TZData(:America/Port-au-Prince) {
     {1162094400 -18000 0 EST}
     {1331449200 -14400 1 EDT}
     {1352008800 -18000 0 EST}
+    {1362898800 -14400 1 EDT}
+    {1383458400 -18000 0 EST}
+    {1394348400 -14400 1 EDT}
+    {1414908000 -18000 0 EST}
+    {1425798000 -14400 1 EDT}
+    {1446357600 -18000 0 EST}
+    {1457852400 -14400 1 EDT}
+    {1478412000 -18000 0 EST}
+    {1489302000 -14400 1 EDT}
+    {1509861600 -18000 0 EST}
+    {1520751600 -14400 1 EDT}
+    {1541311200 -18000 0 EST}
+    {1552201200 -14400 1 EDT}
+    {1572760800 -18000 0 EST}
+    {1583650800 -14400 1 EDT}
+    {1604210400 -18000 0 EST}
+    {1615705200 -14400 1 EDT}
+    {1636264800 -18000 0 EST}
+    {1647154800 -14400 1 EDT}
+    {1667714400 -18000 0 EST}
+    {1678604400 -14400 1 EDT}
+    {1699164000 -18000 0 EST}
+    {1710054000 -14400 1 EDT}
+    {1730613600 -18000 0 EST}
+    {1741503600 -14400 1 EDT}
+    {1762063200 -18000 0 EST}
+    {1772953200 -14400 1 EDT}
+    {1793512800 -18000 0 EST}
+    {1805007600 -14400 1 EDT}
+    {1825567200 -18000 0 EST}
+    {1836457200 -14400 1 EDT}
+    {1857016800 -18000 0 EST}
+    {1867906800 -14400 1 EDT}
+    {1888466400 -18000 0 EST}
+    {1899356400 -14400 1 EDT}
+    {1919916000 -18000 0 EST}
+    {1930806000 -14400 1 EDT}
+    {1951365600 -18000 0 EST}
+    {1962860400 -14400 1 EDT}
+    {1983420000 -18000 0 EST}
+    {1994310000 -14400 1 EDT}
+    {2014869600 -18000 0 EST}
+    {2025759600 -14400 1 EDT}
+    {2046319200 -18000 0 EST}
+    {2057209200 -14400 1 EDT}
+    {2077768800 -18000 0 EST}
+    {2088658800 -14400 1 EDT}
+    {2109218400 -18000 0 EST}
+    {2120108400 -14400 1 EDT}
+    {2140668000 -18000 0 EST}
+    {2152162800 -14400 1 EDT}
+    {2172722400 -18000 0 EST}
+    {2183612400 -14400 1 EDT}
+    {2204172000 -18000 0 EST}
+    {2215062000 -14400 1 EDT}
+    {2235621600 -18000 0 EST}
+    {2246511600 -14400 1 EDT}
+    {2267071200 -18000 0 EST}
+    {2277961200 -14400 1 EDT}
+    {2298520800 -18000 0 EST}
+    {2309410800 -14400 1 EDT}
+    {2329970400 -18000 0 EST}
+    {2341465200 -14400 1 EDT}
+    {2362024800 -18000 0 EST}
+    {2372914800 -14400 1 EDT}
+    {2393474400 -18000 0 EST}
+    {2404364400 -14400 1 EDT}
+    {2424924000 -18000 0 EST}
+    {2435814000 -14400 1 EDT}
+    {2456373600 -18000 0 EST}
+    {2467263600 -14400 1 EDT}
+    {2487823200 -18000 0 EST}
+    {2499318000 -14400 1 EDT}
+    {2519877600 -18000 0 EST}
+    {2530767600 -14400 1 EDT}
+    {2551327200 -18000 0 EST}
+    {2562217200 -14400 1 EDT}
+    {2582776800 -18000 0 EST}
+    {2593666800 -14400 1 EDT}
+    {2614226400 -18000 0 EST}
+    {2625116400 -14400 1 EDT}
+    {2645676000 -18000 0 EST}
+    {2656566000 -14400 1 EDT}
+    {2677125600 -18000 0 EST}
+    {2688620400 -14400 1 EDT}
+    {2709180000 -18000 0 EST}
+    {2720070000 -14400 1 EDT}
+    {2740629600 -18000 0 EST}
+    {2751519600 -14400 1 EDT}
+    {2772079200 -18000 0 EST}
+    {2782969200 -14400 1 EDT}
+    {2803528800 -18000 0 EST}
+    {2814418800 -14400 1 EDT}
+    {2834978400 -18000 0 EST}
+    {2846473200 -14400 1 EDT}
+    {2867032800 -18000 0 EST}
+    {2877922800 -14400 1 EDT}
+    {2898482400 -18000 0 EST}
+    {2909372400 -14400 1 EDT}
+    {2929932000 -18000 0 EST}
+    {2940822000 -14400 1 EDT}
+    {2961381600 -18000 0 EST}
+    {2972271600 -14400 1 EDT}
+    {2992831200 -18000 0 EST}
+    {3003721200 -14400 1 EDT}
+    {3024280800 -18000 0 EST}
+    {3035775600 -14400 1 EDT}
+    {3056335200 -18000 0 EST}
+    {3067225200 -14400 1 EDT}
+    {3087784800 -18000 0 EST}
+    {3098674800 -14400 1 EDT}
+    {3119234400 -18000 0 EST}
+    {3130124400 -14400 1 EDT}
+    {3150684000 -18000 0 EST}
+    {3161574000 -14400 1 EDT}
+    {3182133600 -18000 0 EST}
+    {3193023600 -14400 1 EDT}
+    {3213583200 -18000 0 EST}
+    {3225078000 -14400 1 EDT}
+    {3245637600 -18000 0 EST}
+    {3256527600 -14400 1 EDT}
+    {3277087200 -18000 0 EST}
+    {3287977200 -14400 1 EDT}
+    {3308536800 -18000 0 EST}
+    {3319426800 -14400 1 EDT}
+    {3339986400 -18000 0 EST}
+    {3350876400 -14400 1 EDT}
+    {3371436000 -18000 0 EST}
+    {3382930800 -14400 1 EDT}
+    {3403490400 -18000 0 EST}
+    {3414380400 -14400 1 EDT}
+    {3434940000 -18000 0 EST}
+    {3445830000 -14400 1 EDT}
+    {3466389600 -18000 0 EST}
+    {3477279600 -14400 1 EDT}
+    {3497839200 -18000 0 EST}
+    {3508729200 -14400 1 EDT}
+    {3529288800 -18000 0 EST}
+    {3540178800 -14400 1 EDT}
+    {3560738400 -18000 0 EST}
+    {3572233200 -14400 1 EDT}
+    {3592792800 -18000 0 EST}
+    {3603682800 -14400 1 EDT}
+    {3624242400 -18000 0 EST}
+    {3635132400 -14400 1 EDT}
+    {3655692000 -18000 0 EST}
+    {3666582000 -14400 1 EDT}
+    {3687141600 -18000 0 EST}
+    {3698031600 -14400 1 EDT}
+    {3718591200 -18000 0 EST}
+    {3730086000 -14400 1 EDT}
+    {3750645600 -18000 0 EST}
+    {3761535600 -14400 1 EDT}
+    {3782095200 -18000 0 EST}
+    {3792985200 -14400 1 EDT}
+    {3813544800 -18000 0 EST}
+    {3824434800 -14400 1 EDT}
+    {3844994400 -18000 0 EST}
+    {3855884400 -14400 1 EDT}
+    {3876444000 -18000 0 EST}
+    {3887334000 -14400 1 EDT}
+    {3907893600 -18000 0 EST}
+    {3919388400 -14400 1 EDT}
+    {3939948000 -18000 0 EST}
+    {3950838000 -14400 1 EDT}
+    {3971397600 -18000 0 EST}
+    {3982287600 -14400 1 EDT}
+    {4002847200 -18000 0 EST}
+    {4013737200 -14400 1 EDT}
+    {4034296800 -18000 0 EST}
+    {4045186800 -14400 1 EDT}
+    {4065746400 -18000 0 EST}
+    {4076636400 -14400 1 EDT}
+    {4097196000 -18000 0 EST}
 }
diff --git a/library/tzdata/America/Santiago b/library/tzdata/America/Santiago
index f42ff3d..44be9f8 100644
--- a/library/tzdata/America/Santiago
+++ b/library/tzdata/America/Santiago
@@ -114,178 +114,178 @@ set TZData(:America/Santiago) {
     {1313899200 -10800 1 CLST}
     {1335668400 -14400 0 CLT}
     {1346558400 -10800 1 CLST}
-    {1362884400 -14400 0 CLT}
-    {1381636800 -10800 1 CLST}
-    {1394334000 -14400 0 CLT}
-    {1413086400 -10800 1 CLST}
-    {1426388400 -14400 0 CLT}
-    {1444536000 -10800 1 CLST}
-    {1457838000 -14400 0 CLT}
-    {1475985600 -10800 1 CLST}
-    {1489287600 -14400 0 CLT}
-    {1508040000 -10800 1 CLST}
-    {1520737200 -14400 0 CLT}
-    {1539489600 -10800 1 CLST}
-    {1552186800 -14400 0 CLT}
-    {1570939200 -10800 1 CLST}
-    {1584241200 -14400 0 CLT}
-    {1602388800 -10800 1 CLST}
-    {1615690800 -14400 0 CLT}
-    {1633838400 -10800 1 CLST}
-    {1647140400 -14400 0 CLT}
-    {1665288000 -10800 1 CLST}
-    {1678590000 -14400 0 CLT}
-    {1697342400 -10800 1 CLST}
-    {1710039600 -14400 0 CLT}
-    {1728792000 -10800 1 CLST}
-    {1741489200 -14400 0 CLT}
-    {1760241600 -10800 1 CLST}
-    {1773543600 -14400 0 CLT}
-    {1791691200 -10800 1 CLST}
-    {1804993200 -14400 0 CLT}
-    {1823140800 -10800 1 CLST}
-    {1836442800 -14400 0 CLT}
-    {1855195200 -10800 1 CLST}
-    {1867892400 -14400 0 CLT}
-    {1886644800 -10800 1 CLST}
-    {1899342000 -14400 0 CLT}
-    {1918094400 -10800 1 CLST}
-    {1930791600 -14400 0 CLT}
-    {1949544000 -10800 1 CLST}
-    {1962846000 -14400 0 CLT}
-    {1980993600 -10800 1 CLST}
-    {1994295600 -14400 0 CLT}
-    {2012443200 -10800 1 CLST}
-    {2025745200 -14400 0 CLT}
-    {2044497600 -10800 1 CLST}
-    {2057194800 -14400 0 CLT}
-    {2075947200 -10800 1 CLST}
-    {2088644400 -14400 0 CLT}
-    {2107396800 -10800 1 CLST}
-    {2120698800 -14400 0 CLT}
-    {2138846400 -10800 1 CLST}
-    {2152148400 -14400 0 CLT}
-    {2170296000 -10800 1 CLST}
-    {2183598000 -14400 0 CLT}
-    {2201745600 -10800 1 CLST}
-    {2215047600 -14400 0 CLT}
-    {2233800000 -10800 1 CLST}
-    {2246497200 -14400 0 CLT}
-    {2265249600 -10800 1 CLST}
-    {2277946800 -14400 0 CLT}
-    {2296699200 -10800 1 CLST}
-    {2310001200 -14400 0 CLT}
-    {2328148800 -10800 1 CLST}
-    {2341450800 -14400 0 CLT}
-    {2359598400 -10800 1 CLST}
-    {2372900400 -14400 0 CLT}
-    {2391652800 -10800 1 CLST}
-    {2404350000 -14400 0 CLT}
-    {2423102400 -10800 1 CLST}
-    {2435799600 -14400 0 CLT}
-    {2454552000 -10800 1 CLST}
-    {2467854000 -14400 0 CLT}
-    {2486001600 -10800 1 CLST}
-    {2499303600 -14400 0 CLT}
-    {2517451200 -10800 1 CLST}
-    {2530753200 -14400 0 CLT}
-    {2548900800 -10800 1 CLST}
-    {2562202800 -14400 0 CLT}
-    {2580955200 -10800 1 CLST}
-    {2593652400 -14400 0 CLT}
-    {2612404800 -10800 1 CLST}
-    {2625102000 -14400 0 CLT}
-    {2643854400 -10800 1 CLST}
-    {2657156400 -14400 0 CLT}
-    {2675304000 -10800 1 CLST}
-    {2688606000 -14400 0 CLT}
-    {2706753600 -10800 1 CLST}
-    {2720055600 -14400 0 CLT}
-    {2738808000 -10800 1 CLST}
-    {2751505200 -14400 0 CLT}
-    {2770257600 -10800 1 CLST}
-    {2782954800 -14400 0 CLT}
-    {2801707200 -10800 1 CLST}
-    {2814404400 -14400 0 CLT}
-    {2833156800 -10800 1 CLST}
-    {2846458800 -14400 0 CLT}
-    {2864606400 -10800 1 CLST}
-    {2877908400 -14400 0 CLT}
-    {2896056000 -10800 1 CLST}
-    {2909358000 -14400 0 CLT}
-    {2928110400 -10800 1 CLST}
-    {2940807600 -14400 0 CLT}
-    {2959560000 -10800 1 CLST}
-    {2972257200 -14400 0 CLT}
-    {2991009600 -10800 1 CLST}
-    {3004311600 -14400 0 CLT}
-    {3022459200 -10800 1 CLST}
-    {3035761200 -14400 0 CLT}
-    {3053908800 -10800 1 CLST}
-    {3067210800 -14400 0 CLT}
-    {3085358400 -10800 1 CLST}
-    {3098660400 -14400 0 CLT}
-    {3117412800 -10800 1 CLST}
-    {3130110000 -14400 0 CLT}
-    {3148862400 -10800 1 CLST}
-    {3161559600 -14400 0 CLT}
-    {3180312000 -10800 1 CLST}
-    {3193614000 -14400 0 CLT}
-    {3211761600 -10800 1 CLST}
-    {3225063600 -14400 0 CLT}
-    {3243211200 -10800 1 CLST}
-    {3256513200 -14400 0 CLT}
-    {3275265600 -10800 1 CLST}
-    {3287962800 -14400 0 CLT}
-    {3306715200 -10800 1 CLST}
-    {3319412400 -14400 0 CLT}
-    {3338164800 -10800 1 CLST}
-    {3351466800 -14400 0 CLT}
-    {3369614400 -10800 1 CLST}
-    {3382916400 -14400 0 CLT}
-    {3401064000 -10800 1 CLST}
-    {3414366000 -14400 0 CLT}
-    {3432513600 -10800 1 CLST}
-    {3445815600 -14400 0 CLT}
-    {3464568000 -10800 1 CLST}
-    {3477265200 -14400 0 CLT}
-    {3496017600 -10800 1 CLST}
-    {3508714800 -14400 0 CLT}
-    {3527467200 -10800 1 CLST}
-    {3540769200 -14400 0 CLT}
-    {3558916800 -10800 1 CLST}
-    {3572218800 -14400 0 CLT}
-    {3590366400 -10800 1 CLST}
-    {3603668400 -14400 0 CLT}
-    {3622420800 -10800 1 CLST}
-    {3635118000 -14400 0 CLT}
-    {3653870400 -10800 1 CLST}
-    {3666567600 -14400 0 CLT}
-    {3685320000 -10800 1 CLST}
-    {3698017200 -14400 0 CLT}
-    {3716769600 -10800 1 CLST}
-    {3730071600 -14400 0 CLT}
-    {3748219200 -10800 1 CLST}
-    {3761521200 -14400 0 CLT}
-    {3779668800 -10800 1 CLST}
-    {3792970800 -14400 0 CLT}
-    {3811723200 -10800 1 CLST}
-    {3824420400 -14400 0 CLT}
-    {3843172800 -10800 1 CLST}
-    {3855870000 -14400 0 CLT}
-    {3874622400 -10800 1 CLST}
-    {3887924400 -14400 0 CLT}
-    {3906072000 -10800 1 CLST}
-    {3919374000 -14400 0 CLT}
-    {3937521600 -10800 1 CLST}
-    {3950823600 -14400 0 CLT}
-    {3968971200 -10800 1 CLST}
-    {3982273200 -14400 0 CLT}
-    {4001025600 -10800 1 CLST}
-    {4013722800 -14400 0 CLT}
-    {4032475200 -10800 1 CLST}
-    {4045172400 -14400 0 CLT}
-    {4063924800 -10800 1 CLST}
-    {4077226800 -14400 0 CLT}
-    {4095374400 -10800 1 CLST}
+    {1367118000 -14400 0 CLT}
+    {1378612800 -10800 1 CLST}
+    {1398567600 -14400 0 CLT}
+    {1410062400 -10800 1 CLST}
+    {1430017200 -14400 0 CLT}
+    {1441512000 -10800 1 CLST}
+    {1461466800 -14400 0 CLT}
+    {1472961600 -10800 1 CLST}
+    {1492916400 -14400 0 CLT}
+    {1504411200 -10800 1 CLST}
+    {1524970800 -14400 0 CLT}
+    {1535860800 -10800 1 CLST}
+    {1556420400 -14400 0 CLT}
+    {1567915200 -10800 1 CLST}
+    {1587870000 -14400 0 CLT}
+    {1599364800 -10800 1 CLST}
+    {1619319600 -14400 0 CLT}
+    {1630814400 -10800 1 CLST}
+    {1650769200 -14400 0 CLT}
+    {1662264000 -10800 1 CLST}
+    {1682218800 -14400 0 CLT}
+    {1693713600 -10800 1 CLST}
+    {1714273200 -14400 0 CLT}
+    {1725768000 -10800 1 CLST}
+    {1745722800 -14400 0 CLT}
+    {1757217600 -10800 1 CLST}
+    {1777172400 -14400 0 CLT}
+    {1788667200 -10800 1 CLST}
+    {1808622000 -14400 0 CLT}
+    {1820116800 -10800 1 CLST}
+    {1840071600 -14400 0 CLT}
+    {1851566400 -10800 1 CLST}
+    {1872126000 -14400 0 CLT}
+    {1883016000 -10800 1 CLST}
+    {1903575600 -14400 0 CLT}
+    {1915070400 -10800 1 CLST}
+    {1935025200 -14400 0 CLT}
+    {1946520000 -10800 1 CLST}
+    {1966474800 -14400 0 CLT}
+    {1977969600 -10800 1 CLST}
+    {1997924400 -14400 0 CLT}
+    {2009419200 -10800 1 CLST}
+    {2029374000 -14400 0 CLT}
+    {2040868800 -10800 1 CLST}
+    {2061428400 -14400 0 CLT}
+    {2072318400 -10800 1 CLST}
+    {2092878000 -14400 0 CLT}
+    {2104372800 -10800 1 CLST}
+    {2124327600 -14400 0 CLT}
+    {2135822400 -10800 1 CLST}
+    {2155777200 -14400 0 CLT}
+    {2167272000 -10800 1 CLST}
+    {2187226800 -14400 0 CLT}
+    {2198721600 -10800 1 CLST}
+    {2219281200 -14400 0 CLT}
+    {2230171200 -10800 1 CLST}
+    {2250730800 -14400 0 CLT}
+    {2262225600 -10800 1 CLST}
+    {2282180400 -14400 0 CLT}
+    {2293675200 -10800 1 CLST}
+    {2313630000 -14400 0 CLT}
+    {2325124800 -10800 1 CLST}
+    {2345079600 -14400 0 CLT}
+    {2356574400 -10800 1 CLST}
+    {2376529200 -14400 0 CLT}
+    {2388024000 -10800 1 CLST}
+    {2408583600 -14400 0 CLT}
+    {2419473600 -10800 1 CLST}
+    {2440033200 -14400 0 CLT}
+    {2451528000 -10800 1 CLST}
+    {2471482800 -14400 0 CLT}
+    {2482977600 -10800 1 CLST}
+    {2502932400 -14400 0 CLT}
+    {2514427200 -10800 1 CLST}
+    {2534382000 -14400 0 CLT}
+    {2545876800 -10800 1 CLST}
+    {2565831600 -14400 0 CLT}
+    {2577326400 -10800 1 CLST}
+    {2597886000 -14400 0 CLT}
+    {2609380800 -10800 1 CLST}
+    {2629335600 -14400 0 CLT}
+    {2640830400 -10800 1 CLST}
+    {2660785200 -14400 0 CLT}
+    {2672280000 -10800 1 CLST}
+    {2692234800 -14400 0 CLT}
+    {2703729600 -10800 1 CLST}
+    {2723684400 -14400 0 CLT}
+    {2735179200 -10800 1 CLST}
+    {2755738800 -14400 0 CLT}
+    {2766628800 -10800 1 CLST}
+    {2787188400 -14400 0 CLT}
+    {2798683200 -10800 1 CLST}
+    {2818638000 -14400 0 CLT}
+    {2830132800 -10800 1 CLST}
+    {2850087600 -14400 0 CLT}
+    {2861582400 -10800 1 CLST}
+    {2881537200 -14400 0 CLT}
+    {2893032000 -10800 1 CLST}
+    {2912986800 -14400 0 CLT}
+    {2924481600 -10800 1 CLST}
+    {2945041200 -14400 0 CLT}
+    {2955931200 -10800 1 CLST}
+    {2976490800 -14400 0 CLT}
+    {2987985600 -10800 1 CLST}
+    {3007940400 -14400 0 CLT}
+    {3019435200 -10800 1 CLST}
+    {3039390000 -14400 0 CLT}
+    {3050884800 -10800 1 CLST}
+    {3070839600 -14400 0 CLT}
+    {3082334400 -10800 1 CLST}
+    {3102894000 -14400 0 CLT}
+    {3113784000 -10800 1 CLST}
+    {3134343600 -14400 0 CLT}
+    {3145838400 -10800 1 CLST}
+    {3165793200 -14400 0 CLT}
+    {3177288000 -10800 1 CLST}
+    {3197242800 -14400 0 CLT}
+    {3208737600 -10800 1 CLST}
+    {3228692400 -14400 0 CLT}
+    {3240187200 -10800 1 CLST}
+    {3260142000 -14400 0 CLT}
+    {3271636800 -10800 1 CLST}
+    {3292196400 -14400 0 CLT}
+    {3303086400 -10800 1 CLST}
+    {3323646000 -14400 0 CLT}
+    {3335140800 -10800 1 CLST}
+    {3355095600 -14400 0 CLT}
+    {3366590400 -10800 1 CLST}
+    {3386545200 -14400 0 CLT}
+    {3398040000 -10800 1 CLST}
+    {3417994800 -14400 0 CLT}
+    {3429489600 -10800 1 CLST}
+    {3449444400 -14400 0 CLT}
+    {3460939200 -10800 1 CLST}
+    {3481498800 -14400 0 CLT}
+    {3492993600 -10800 1 CLST}
+    {3512948400 -14400 0 CLT}
+    {3524443200 -10800 1 CLST}
+    {3544398000 -14400 0 CLT}
+    {3555892800 -10800 1 CLST}
+    {3575847600 -14400 0 CLT}
+    {3587342400 -10800 1 CLST}
+    {3607297200 -14400 0 CLT}
+    {3618792000 -10800 1 CLST}
+    {3639351600 -14400 0 CLT}
+    {3650241600 -10800 1 CLST}
+    {3670801200 -14400 0 CLT}
+    {3682296000 -10800 1 CLST}
+    {3702250800 -14400 0 CLT}
+    {3713745600 -10800 1 CLST}
+    {3733700400 -14400 0 CLT}
+    {3745195200 -10800 1 CLST}
+    {3765150000 -14400 0 CLT}
+    {3776644800 -10800 1 CLST}
+    {3796599600 -14400 0 CLT}
+    {3808094400 -10800 1 CLST}
+    {3828654000 -14400 0 CLT}
+    {3839544000 -10800 1 CLST}
+    {3860103600 -14400 0 CLT}
+    {3871598400 -10800 1 CLST}
+    {3891553200 -14400 0 CLT}
+    {3903048000 -10800 1 CLST}
+    {3923002800 -14400 0 CLT}
+    {3934497600 -10800 1 CLST}
+    {3954452400 -14400 0 CLT}
+    {3965947200 -10800 1 CLST}
+    {3986506800 -14400 0 CLT}
+    {3997396800 -10800 1 CLST}
+    {4017956400 -14400 0 CLT}
+    {4029451200 -10800 1 CLST}
+    {4049406000 -14400 0 CLT}
+    {4060900800 -10800 1 CLST}
+    {4080855600 -14400 0 CLT}
+    {4092350400 -10800 1 CLST}
 }
diff --git a/library/tzdata/Antarctica/Macquarie b/library/tzdata/Antarctica/Macquarie
index 9877ee8..bd5cf8a 100644
--- a/library/tzdata/Antarctica/Macquarie
+++ b/library/tzdata/Antarctica/Macquarie
@@ -2,16 +2,11 @@
 
 set TZData(:Antarctica/Macquarie) {
     {-9223372036854775808 0 0 zzz}
-    {-1861920000 36000 0 EST}
+    {-2214259200 36000 0 EST}
     {-1680508800 39600 1 EST}
     {-1669892400 39600 0 EST}
     {-1665392400 36000 0 EST}
-    {-883641600 39600 1 EST}
-    {-876128400 36000 0 EST}
-    {-860400000 39600 1 EST}
-    {-844678800 36000 0 EST}
-    {-828345600 39600 1 EST}
-    {-813229200 36000 0 EST}
+    {-1601719200 0 0 zzz}
     {-94730400 36000 0 EST}
     {-71136000 39600 1 EST}
     {-55411200 36000 0 EST}
diff --git a/library/tzdata/Antarctica/Palmer b/library/tzdata/Antarctica/Palmer
index 601a684..e87b171 100644
--- a/library/tzdata/Antarctica/Palmer
+++ b/library/tzdata/Antarctica/Palmer
@@ -77,178 +77,178 @@ set TZData(:Antarctica/Palmer) {
     {1313899200 -10800 1 CLST}
     {1335668400 -14400 0 CLT}
     {1346558400 -10800 1 CLST}
-    {1362884400 -14400 0 CLT}
-    {1381636800 -10800 1 CLST}
-    {1394334000 -14400 0 CLT}
-    {1413086400 -10800 1 CLST}
-    {1426388400 -14400 0 CLT}
-    {1444536000 -10800 1 CLST}
-    {1457838000 -14400 0 CLT}
-    {1475985600 -10800 1 CLST}
-    {1489287600 -14400 0 CLT}
-    {1508040000 -10800 1 CLST}
-    {1520737200 -14400 0 CLT}
-    {1539489600 -10800 1 CLST}
-    {1552186800 -14400 0 CLT}
-    {1570939200 -10800 1 CLST}
-    {1584241200 -14400 0 CLT}
-    {1602388800 -10800 1 CLST}
-    {1615690800 -14400 0 CLT}
-    {1633838400 -10800 1 CLST}
-    {1647140400 -14400 0 CLT}
-    {1665288000 -10800 1 CLST}
-    {1678590000 -14400 0 CLT}
-    {1697342400 -10800 1 CLST}
-    {1710039600 -14400 0 CLT}
-    {1728792000 -10800 1 CLST}
-    {1741489200 -14400 0 CLT}
-    {1760241600 -10800 1 CLST}
-    {1773543600 -14400 0 CLT}
-    {1791691200 -10800 1 CLST}
-    {1804993200 -14400 0 CLT}
-    {1823140800 -10800 1 CLST}
-    {1836442800 -14400 0 CLT}
-    {1855195200 -10800 1 CLST}
-    {1867892400 -14400 0 CLT}
-    {1886644800 -10800 1 CLST}
-    {1899342000 -14400 0 CLT}
-    {1918094400 -10800 1 CLST}
-    {1930791600 -14400 0 CLT}
-    {1949544000 -10800 1 CLST}
-    {1962846000 -14400 0 CLT}
-    {1980993600 -10800 1 CLST}
-    {1994295600 -14400 0 CLT}
-    {2012443200 -10800 1 CLST}
-    {2025745200 -14400 0 CLT}
-    {2044497600 -10800 1 CLST}
-    {2057194800 -14400 0 CLT}
-    {2075947200 -10800 1 CLST}
-    {2088644400 -14400 0 CLT}
-    {2107396800 -10800 1 CLST}
-    {2120698800 -14400 0 CLT}
-    {2138846400 -10800 1 CLST}
-    {2152148400 -14400 0 CLT}
-    {2170296000 -10800 1 CLST}
-    {2183598000 -14400 0 CLT}
-    {2201745600 -10800 1 CLST}
-    {2215047600 -14400 0 CLT}
-    {2233800000 -10800 1 CLST}
-    {2246497200 -14400 0 CLT}
-    {2265249600 -10800 1 CLST}
-    {2277946800 -14400 0 CLT}
-    {2296699200 -10800 1 CLST}
-    {2310001200 -14400 0 CLT}
-    {2328148800 -10800 1 CLST}
-    {2341450800 -14400 0 CLT}
-    {2359598400 -10800 1 CLST}
-    {2372900400 -14400 0 CLT}
-    {2391652800 -10800 1 CLST}
-    {2404350000 -14400 0 CLT}
-    {2423102400 -10800 1 CLST}
-    {2435799600 -14400 0 CLT}
-    {2454552000 -10800 1 CLST}
-    {2467854000 -14400 0 CLT}
-    {2486001600 -10800 1 CLST}
-    {2499303600 -14400 0 CLT}
-    {2517451200 -10800 1 CLST}
-    {2530753200 -14400 0 CLT}
-    {2548900800 -10800 1 CLST}
-    {2562202800 -14400 0 CLT}
-    {2580955200 -10800 1 CLST}
-    {2593652400 -14400 0 CLT}
-    {2612404800 -10800 1 CLST}
-    {2625102000 -14400 0 CLT}
-    {2643854400 -10800 1 CLST}
-    {2657156400 -14400 0 CLT}
-    {2675304000 -10800 1 CLST}
-    {2688606000 -14400 0 CLT}
-    {2706753600 -10800 1 CLST}
-    {2720055600 -14400 0 CLT}
-    {2738808000 -10800 1 CLST}
-    {2751505200 -14400 0 CLT}
-    {2770257600 -10800 1 CLST}
-    {2782954800 -14400 0 CLT}
-    {2801707200 -10800 1 CLST}
-    {2814404400 -14400 0 CLT}
-    {2833156800 -10800 1 CLST}
-    {2846458800 -14400 0 CLT}
-    {2864606400 -10800 1 CLST}
-    {2877908400 -14400 0 CLT}
-    {2896056000 -10800 1 CLST}
-    {2909358000 -14400 0 CLT}
-    {2928110400 -10800 1 CLST}
-    {2940807600 -14400 0 CLT}
-    {2959560000 -10800 1 CLST}
-    {2972257200 -14400 0 CLT}
-    {2991009600 -10800 1 CLST}
-    {3004311600 -14400 0 CLT}
-    {3022459200 -10800 1 CLST}
-    {3035761200 -14400 0 CLT}
-    {3053908800 -10800 1 CLST}
-    {3067210800 -14400 0 CLT}
-    {3085358400 -10800 1 CLST}
-    {3098660400 -14400 0 CLT}
-    {3117412800 -10800 1 CLST}
-    {3130110000 -14400 0 CLT}
-    {3148862400 -10800 1 CLST}
-    {3161559600 -14400 0 CLT}
-    {3180312000 -10800 1 CLST}
-    {3193614000 -14400 0 CLT}
-    {3211761600 -10800 1 CLST}
-    {3225063600 -14400 0 CLT}
-    {3243211200 -10800 1 CLST}
-    {3256513200 -14400 0 CLT}
-    {3275265600 -10800 1 CLST}
-    {3287962800 -14400 0 CLT}
-    {3306715200 -10800 1 CLST}
-    {3319412400 -14400 0 CLT}
-    {3338164800 -10800 1 CLST}
-    {3351466800 -14400 0 CLT}
-    {3369614400 -10800 1 CLST}
-    {3382916400 -14400 0 CLT}
-    {3401064000 -10800 1 CLST}
-    {3414366000 -14400 0 CLT}
-    {3432513600 -10800 1 CLST}
-    {3445815600 -14400 0 CLT}
-    {3464568000 -10800 1 CLST}
-    {3477265200 -14400 0 CLT}
-    {3496017600 -10800 1 CLST}
-    {3508714800 -14400 0 CLT}
-    {3527467200 -10800 1 CLST}
-    {3540769200 -14400 0 CLT}
-    {3558916800 -10800 1 CLST}
-    {3572218800 -14400 0 CLT}
-    {3590366400 -10800 1 CLST}
-    {3603668400 -14400 0 CLT}
-    {3622420800 -10800 1 CLST}
-    {3635118000 -14400 0 CLT}
-    {3653870400 -10800 1 CLST}
-    {3666567600 -14400 0 CLT}
-    {3685320000 -10800 1 CLST}
-    {3698017200 -14400 0 CLT}
-    {3716769600 -10800 1 CLST}
-    {3730071600 -14400 0 CLT}
-    {3748219200 -10800 1 CLST}
-    {3761521200 -14400 0 CLT}
-    {3779668800 -10800 1 CLST}
-    {3792970800 -14400 0 CLT}
-    {3811723200 -10800 1 CLST}
-    {3824420400 -14400 0 CLT}
-    {3843172800 -10800 1 CLST}
-    {3855870000 -14400 0 CLT}
-    {3874622400 -10800 1 CLST}
-    {3887924400 -14400 0 CLT}
-    {3906072000 -10800 1 CLST}
-    {3919374000 -14400 0 CLT}
-    {3937521600 -10800 1 CLST}
-    {3950823600 -14400 0 CLT}
-    {3968971200 -10800 1 CLST}
-    {3982273200 -14400 0 CLT}
-    {4001025600 -10800 1 CLST}
-    {4013722800 -14400 0 CLT}
-    {4032475200 -10800 1 CLST}
-    {4045172400 -14400 0 CLT}
-    {4063924800 -10800 1 CLST}
-    {4077226800 -14400 0 CLT}
-    {4095374400 -10800 1 CLST}
+    {1367118000 -14400 0 CLT}
+    {1378612800 -10800 1 CLST}
+    {1398567600 -14400 0 CLT}
+    {1410062400 -10800 1 CLST}
+    {1430017200 -14400 0 CLT}
+    {1441512000 -10800 1 CLST}
+    {1461466800 -14400 0 CLT}
+    {1472961600 -10800 1 CLST}
+    {1492916400 -14400 0 CLT}
+    {1504411200 -10800 1 CLST}
+    {1524970800 -14400 0 CLT}
+    {1535860800 -10800 1 CLST}
+    {1556420400 -14400 0 CLT}
+    {1567915200 -10800 1 CLST}
+    {1587870000 -14400 0 CLT}
+    {1599364800 -10800 1 CLST}
+    {1619319600 -14400 0 CLT}
+    {1630814400 -10800 1 CLST}
+    {1650769200 -14400 0 CLT}
+    {1662264000 -10800 1 CLST}
+    {1682218800 -14400 0 CLT}
+    {1693713600 -10800 1 CLST}
+    {1714273200 -14400 0 CLT}
+    {1725768000 -10800 1 CLST}
+    {1745722800 -14400 0 CLT}
+    {1757217600 -10800 1 CLST}
+    {1777172400 -14400 0 CLT}
+    {1788667200 -10800 1 CLST}
+    {1808622000 -14400 0 CLT}
+    {1820116800 -10800 1 CLST}
+    {1840071600 -14400 0 CLT}
+    {1851566400 -10800 1 CLST}
+    {1872126000 -14400 0 CLT}
+    {1883016000 -10800 1 CLST}
+    {1903575600 -14400 0 CLT}
+    {1915070400 -10800 1 CLST}
+    {1935025200 -14400 0 CLT}
+    {1946520000 -10800 1 CLST}
+    {1966474800 -14400 0 CLT}
+    {1977969600 -10800 1 CLST}
+    {1997924400 -14400 0 CLT}
+    {2009419200 -10800 1 CLST}
+    {2029374000 -14400 0 CLT}
+    {2040868800 -10800 1 CLST}
+    {2061428400 -14400 0 CLT}
+    {2072318400 -10800 1 CLST}
+    {2092878000 -14400 0 CLT}
+    {2104372800 -10800 1 CLST}
+    {2124327600 -14400 0 CLT}
+    {2135822400 -10800 1 CLST}
+    {2155777200 -14400 0 CLT}
+    {2167272000 -10800 1 CLST}
+    {2187226800 -14400 0 CLT}
+    {2198721600 -10800 1 CLST}
+    {2219281200 -14400 0 CLT}
+    {2230171200 -10800 1 CLST}
+    {2250730800 -14400 0 CLT}
+    {2262225600 -10800 1 CLST}
+    {2282180400 -14400 0 CLT}
+    {2293675200 -10800 1 CLST}
+    {2313630000 -14400 0 CLT}
+    {2325124800 -10800 1 CLST}
+    {2345079600 -14400 0 CLT}
+    {2356574400 -10800 1 CLST}
+    {2376529200 -14400 0 CLT}
+    {2388024000 -10800 1 CLST}
+    {2408583600 -14400 0 CLT}
+    {2419473600 -10800 1 CLST}
+    {2440033200 -14400 0 CLT}
+    {2451528000 -10800 1 CLST}
+    {2471482800 -14400 0 CLT}
+    {2482977600 -10800 1 CLST}
+    {2502932400 -14400 0 CLT}
+    {2514427200 -10800 1 CLST}
+    {2534382000 -14400 0 CLT}
+    {2545876800 -10800 1 CLST}
+    {2565831600 -14400 0 CLT}
+    {2577326400 -10800 1 CLST}
+    {2597886000 -14400 0 CLT}
+    {2609380800 -10800 1 CLST}
+    {2629335600 -14400 0 CLT}
+    {2640830400 -10800 1 CLST}
+    {2660785200 -14400 0 CLT}
+    {2672280000 -10800 1 CLST}
+    {2692234800 -14400 0 CLT}
+    {2703729600 -10800 1 CLST}
+    {2723684400 -14400 0 CLT}
+    {2735179200 -10800 1 CLST}
+    {2755738800 -14400 0 CLT}
+    {2766628800 -10800 1 CLST}
+    {2787188400 -14400 0 CLT}
+    {2798683200 -10800 1 CLST}
+    {2818638000 -14400 0 CLT}
+    {2830132800 -10800 1 CLST}
+    {2850087600 -14400 0 CLT}
+    {2861582400 -10800 1 CLST}
+    {2881537200 -14400 0 CLT}
+    {2893032000 -10800 1 CLST}
+    {2912986800 -14400 0 CLT}
+    {2924481600 -10800 1 CLST}
+    {2945041200 -14400 0 CLT}
+    {2955931200 -10800 1 CLST}
+    {2976490800 -14400 0 CLT}
+    {2987985600 -10800 1 CLST}
+    {3007940400 -14400 0 CLT}
+    {3019435200 -10800 1 CLST}
+    {3039390000 -14400 0 CLT}
+    {3050884800 -10800 1 CLST}
+    {3070839600 -14400 0 CLT}
+    {3082334400 -10800 1 CLST}
+    {3102894000 -14400 0 CLT}
+    {3113784000 -10800 1 CLST}
+    {3134343600 -14400 0 CLT}
+    {3145838400 -10800 1 CLST}
+    {3165793200 -14400 0 CLT}
+    {3177288000 -10800 1 CLST}
+    {3197242800 -14400 0 CLT}
+    {3208737600 -10800 1 CLST}
+    {3228692400 -14400 0 CLT}
+    {3240187200 -10800 1 CLST}
+    {3260142000 -14400 0 CLT}
+    {3271636800 -10800 1 CLST}
+    {3292196400 -14400 0 CLT}
+    {3303086400 -10800 1 CLST}
+    {3323646000 -14400 0 CLT}
+    {3335140800 -10800 1 CLST}
+    {3355095600 -14400 0 CLT}
+    {3366590400 -10800 1 CLST}
+    {3386545200 -14400 0 CLT}
+    {3398040000 -10800 1 CLST}
+    {3417994800 -14400 0 CLT}
+    {3429489600 -10800 1 CLST}
+    {3449444400 -14400 0 CLT}
+    {3460939200 -10800 1 CLST}
+    {3481498800 -14400 0 CLT}
+    {3492993600 -10800 1 CLST}
+    {3512948400 -14400 0 CLT}
+    {3524443200 -10800 1 CLST}
+    {3544398000 -14400 0 CLT}
+    {3555892800 -10800 1 CLST}
+    {3575847600 -14400 0 CLT}
+    {3587342400 -10800 1 CLST}
+    {3607297200 -14400 0 CLT}
+    {3618792000 -10800 1 CLST}
+    {3639351600 -14400 0 CLT}
+    {3650241600 -10800 1 CLST}
+    {3670801200 -14400 0 CLT}
+    {3682296000 -10800 1 CLST}
+    {3702250800 -14400 0 CLT}
+    {3713745600 -10800 1 CLST}
+    {3733700400 -14400 0 CLT}
+    {3745195200 -10800 1 CLST}
+    {3765150000 -14400 0 CLT}
+    {3776644800 -10800 1 CLST}
+    {3796599600 -14400 0 CLT}
+    {3808094400 -10800 1 CLST}
+    {3828654000 -14400 0 CLT}
+    {3839544000 -10800 1 CLST}
+    {3860103600 -14400 0 CLT}
+    {3871598400 -10800 1 CLST}
+    {3891553200 -14400 0 CLT}
+    {3903048000 -10800 1 CLST}
+    {3923002800 -14400 0 CLT}
+    {3934497600 -10800 1 CLST}
+    {3954452400 -14400 0 CLT}
+    {3965947200 -10800 1 CLST}
+    {3986506800 -14400 0 CLT}
+    {3997396800 -10800 1 CLST}
+    {4017956400 -14400 0 CLT}
+    {4029451200 -10800 1 CLST}
+    {4049406000 -14400 0 CLT}
+    {4060900800 -10800 1 CLST}
+    {4080855600 -14400 0 CLT}
+    {4092350400 -10800 1 CLST}
 }
diff --git a/library/tzdata/Asia/Aden b/library/tzdata/Asia/Aden
index e939235..399d9f0 100644
--- a/library/tzdata/Asia/Aden
+++ b/library/tzdata/Asia/Aden
@@ -1,6 +1,6 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Aden) {
-    {-9223372036854775808 10848 0 LMT}
-    {-631162848 10800 0 AST}
+    {-9223372036854775808 10794 0 LMT}
+    {-631162794 10800 0 AST}
 }
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 43e1847..a0636e2 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -88,14 +88,191 @@ set TZData(:Asia/Gaza) {
     {1158872400 7200 0 EET}
     {1175378400 10800 1 EEST}
     {1189638000 7200 0 EET}
-    {1207000800 10800 1 EEST}
-    {1219957200 7200 0 EET}
+    {1206655200 10800 1 EEST}
+    {1219960800 7200 0 EET}
+    {1220220000 7200 0 EET}
     {1238104800 10800 1 EEST}
-    {1252018800 7200 0 EET}
-    {1269640860 10800 1 EEST}
+    {1252015200 7200 0 EET}
+    {1262296800 7200 0 EET}
+    {1269640860 10800 0 EEST}
     {1281474000 7200 0 EET}
-    {1301738460 10800 1 EEST}
-    {1312146000 7200 0 EET}
+    {1301608860 10800 1 EEST}
+    {1312149600 7200 0 EET}
+    {1325368800 7200 0 EET}
     {1333058400 10800 1 EEST}
     {1348178400 7200 0 EET}
+    {1364508000 10800 1 EEST}
+    {1380232800 7200 0 EET}
+    {1395957600 10800 1 EEST}
+    {1411682400 7200 0 EET}
+    {1427407200 10800 1 EEST}
+    {1443132000 7200 0 EET}
+    {1459461600 10800 1 EEST}
+    {1474581600 7200 0 EET}
+    {1490911200 10800 1 EEST}
+    {1506031200 7200 0 EET}
+    {1522360800 10800 1 EEST}
+    {1537480800 7200 0 EET}
+    {1553810400 10800 1 EEST}
+    {1569535200 7200 0 EET}
+    {1585260000 10800 1 EEST}
+    {1600984800 7200 0 EET}
+    {1616709600 10800 1 EEST}
+    {1632434400 7200 0 EET}
+    {1648764000 10800 1 EEST}
+    {1663884000 7200 0 EET}
+    {1680213600 10800 1 EEST}
+    {1695333600 7200 0 EET}
+    {1711663200 10800 1 EEST}
+    {1727388000 7200 0 EET}
+    {1743112800 10800 1 EEST}
+    {1758837600 7200 0 EET}
+    {1774562400 10800 1 EEST}
+    {1790287200 7200 0 EET}
+    {1806012000 10800 1 EEST}
+    {1821736800 7200 0 EET}
+    {1838066400 10800 1 EEST}
+    {1853186400 7200 0 EET}
+    {1869516000 10800 1 EEST}
+    {1884636000 7200 0 EET}
+    {1900965600 10800 1 EEST}
+    {1916690400 7200 0 EET}
+    {1932415200 10800 1 EEST}
+    {1948140000 7200 0 EET}
+    {1963864800 10800 1 EEST}
+    {1979589600 7200 0 EET}
+    {1995919200 10800 1 EEST}
+    {2011039200 7200 0 EET}
+    {2027368800 10800 1 EEST}
+    {2042488800 7200 0 EET}
+    {2058818400 10800 1 EEST}
+    {2073938400 7200 0 EET}
+    {2090268000 10800 1 EEST}
+    {2105992800 7200 0 EET}
+    {2121717600 10800 1 EEST}
+    {2137442400 7200 0 EET}
+    {2153167200 10800 1 EEST}
+    {2168892000 7200 0 EET}
+    {2185221600 10800 1 EEST}
+    {2200341600 7200 0 EET}
+    {2216671200 10800 1 EEST}
+    {2231791200 7200 0 EET}
+    {2248120800 10800 1 EEST}
+    {2263845600 7200 0 EET}
+    {2279570400 10800 1 EEST}
+    {2295295200 7200 0 EET}
+    {2311020000 10800 1 EEST}
+    {2326744800 7200 0 EET}
+    {2343074400 10800 1 EEST}
+    {2358194400 7200 0 EET}
+    {2374524000 10800 1 EEST}
+    {2389644000 7200 0 EET}
+    {2405973600 10800 1 EEST}
+    {2421093600 7200 0 EET}
+    {2437423200 10800 1 EEST}
+    {2453148000 7200 0 EET}
+    {2468872800 10800 1 EEST}
+    {2484597600 7200 0 EET}
+    {2500322400 10800 1 EEST}
+    {2516047200 7200 0 EET}
+    {2532376800 10800 1 EEST}
+    {2547496800 7200 0 EET}
+    {2563826400 10800 1 EEST}
+    {2578946400 7200 0 EET}
+    {2595276000 10800 1 EEST}
+    {2611000800 7200 0 EET}
+    {2626725600 10800 1 EEST}
+    {2642450400 7200 0 EET}
+    {2658175200 10800 1 EEST}
+    {2673900000 7200 0 EET}
+    {2689624800 10800 1 EEST}
+    {2705349600 7200 0 EET}
+    {2721679200 10800 1 EEST}
+    {2736799200 7200 0 EET}
+    {2753128800 10800 1 EEST}
+    {2768248800 7200 0 EET}
+    {2784578400 10800 1 EEST}
+    {2800303200 7200 0 EET}
+    {2816028000 10800 1 EEST}
+    {2831752800 7200 0 EET}
+    {2847477600 10800 1 EEST}
+    {2863202400 7200 0 EET}
+    {2879532000 10800 1 EEST}
+    {2894652000 7200 0 EET}
+    {2910981600 10800 1 EEST}
+    {2926101600 7200 0 EET}
+    {2942431200 10800 1 EEST}
+    {2957551200 7200 0 EET}
+    {2973880800 10800 1 EEST}
+    {2989605600 7200 0 EET}
+    {3005330400 10800 1 EEST}
+    {3021055200 7200 0 EET}
+    {3036780000 10800 1 EEST}
+    {3052504800 7200 0 EET}
+    {3068834400 10800 1 EEST}
+    {3083954400 7200 0 EET}
+    {3100284000 10800 1 EEST}
+    {3115404000 7200 0 EET}
+    {3131733600 10800 1 EEST}
+    {3147458400 7200 0 EET}
+    {3163183200 10800 1 EEST}
+    {3178908000 7200 0 EET}
+    {3194632800 10800 1 EEST}
+    {3210357600 7200 0 EET}
+    {3226687200 10800 1 EEST}
+    {3241807200 7200 0 EET}
+    {3258136800 10800 1 EEST}
+    {3273256800 7200 0 EET}
+    {3289586400 10800 1 EEST}
+    {3304706400 7200 0 EET}
+    {3321036000 10800 1 EEST}
+    {3336760800 7200 0 EET}
+    {3352485600 10800 1 EEST}
+    {3368210400 7200 0 EET}
+    {3383935200 10800 1 EEST}
+    {3399660000 7200 0 EET}
+    {3415989600 10800 1 EEST}
+    {3431109600 7200 0 EET}
+    {3447439200 10800 1 EEST}
+    {3462559200 7200 0 EET}
+    {3478888800 10800 1 EEST}
+    {3494613600 7200 0 EET}
+    {3510338400 10800 1 EEST}
+    {3526063200 7200 0 EET}
+    {3541788000 10800 1 EEST}
+    {3557512800 7200 0 EET}
+    {3573237600 10800 1 EEST}
+    {3588962400 7200 0 EET}
+    {3605292000 10800 1 EEST}
+    {3620412000 7200 0 EET}
+    {3636741600 10800 1 EEST}
+    {3651861600 7200 0 EET}
+    {3668191200 10800 1 EEST}
+    {3683916000 7200 0 EET}
+    {3699640800 10800 1 EEST}
+    {3715365600 7200 0 EET}
+    {3731090400 10800 1 EEST}
+    {3746815200 7200 0 EET}
+    {3763144800 10800 1 EEST}
+    {3778264800 7200 0 EET}
+    {3794594400 10800 1 EEST}
+    {3809714400 7200 0 EET}
+    {3826044000 10800 1 EEST}
+    {3841164000 7200 0 EET}
+    {3857493600 10800 1 EEST}
+    {3873218400 7200 0 EET}
+    {3888943200 10800 1 EEST}
+    {3904668000 7200 0 EET}
+    {3920392800 10800 1 EEST}
+    {3936117600 7200 0 EET}
+    {3952447200 10800 1 EEST}
+    {3967567200 7200 0 EET}
+    {3983896800 10800 1 EEST}
+    {3999016800 7200 0 EET}
+    {4015346400 10800 1 EEST}
+    {4031071200 7200 0 EET}
+    {4046796000 10800 1 EEST}
+    {4062520800 7200 0 EET}
+    {4078245600 10800 1 EEST}
+    {4093970400 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index 98bb353..a8a9019 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -88,17 +88,190 @@ set TZData(:Asia/Hebron) {
     {1158872400 7200 0 EET}
     {1175378400 10800 1 EEST}
     {1189638000 7200 0 EET}
-    {1207000800 10800 1 EEST}
-    {1217541600 10800 1 EEST}
+    {1206655200 10800 1 EEST}
     {1220216400 7200 0 EET}
     {1238104800 10800 1 EEST}
-    {1252018800 7200 0 EET}
-    {1269640860 10800 1 EEST}
+    {1252015200 7200 0 EET}
+    {1269554400 10800 1 EEST}
     {1281474000 7200 0 EET}
-    {1301652060 10800 1 EEST}
+    {1301608860 10800 1 EEST}
     {1312146000 7200 0 EET}
     {1314655200 10800 1 EEST}
-    {1317340800 7200 0 EET}
+    {1317330000 7200 0 EET}
     {1333058400 10800 1 EEST}
     {1348178400 7200 0 EET}
+    {1364508000 10800 1 EEST}
+    {1380232800 7200 0 EET}
+    {1395957600 10800 1 EEST}
+    {1411682400 7200 0 EET}
+    {1427407200 10800 1 EEST}
+    {1443132000 7200 0 EET}
+    {1459461600 10800 1 EEST}
+    {1474581600 7200 0 EET}
+    {1490911200 10800 1 EEST}
+    {1506031200 7200 0 EET}
+    {1522360800 10800 1 EEST}
+    {1537480800 7200 0 EET}
+    {1553810400 10800 1 EEST}
+    {1569535200 7200 0 EET}
+    {1585260000 10800 1 EEST}
+    {1600984800 7200 0 EET}
+    {1616709600 10800 1 EEST}
+    {1632434400 7200 0 EET}
+    {1648764000 10800 1 EEST}
+    {1663884000 7200 0 EET}
+    {1680213600 10800 1 EEST}
+    {1695333600 7200 0 EET}
+    {1711663200 10800 1 EEST}
+    {1727388000 7200 0 EET}
+    {1743112800 10800 1 EEST}
+    {1758837600 7200 0 EET}
+    {1774562400 10800 1 EEST}
+    {1790287200 7200 0 EET}
+    {1806012000 10800 1 EEST}
+    {1821736800 7200 0 EET}
+    {1838066400 10800 1 EEST}
+    {1853186400 7200 0 EET}
+    {1869516000 10800 1 EEST}
+    {1884636000 7200 0 EET}
+    {1900965600 10800 1 EEST}
+    {1916690400 7200 0 EET}
+    {1932415200 10800 1 EEST}
+    {1948140000 7200 0 EET}
+    {1963864800 10800 1 EEST}
+    {1979589600 7200 0 EET}
+    {1995919200 10800 1 EEST}
+    {2011039200 7200 0 EET}
+    {2027368800 10800 1 EEST}
+    {2042488800 7200 0 EET}
+    {2058818400 10800 1 EEST}
+    {2073938400 7200 0 EET}
+    {2090268000 10800 1 EEST}
+    {2105992800 7200 0 EET}
+    {2121717600 10800 1 EEST}
+    {2137442400 7200 0 EET}
+    {2153167200 10800 1 EEST}
+    {2168892000 7200 0 EET}
+    {2185221600 10800 1 EEST}
+    {2200341600 7200 0 EET}
+    {2216671200 10800 1 EEST}
+    {2231791200 7200 0 EET}
+    {2248120800 10800 1 EEST}
+    {2263845600 7200 0 EET}
+    {2279570400 10800 1 EEST}
+    {2295295200 7200 0 EET}
+    {2311020000 10800 1 EEST}
+    {2326744800 7200 0 EET}
+    {2343074400 10800 1 EEST}
+    {2358194400 7200 0 EET}
+    {2374524000 10800 1 EEST}
+    {2389644000 7200 0 EET}
+    {2405973600 10800 1 EEST}
+    {2421093600 7200 0 EET}
+    {2437423200 10800 1 EEST}
+    {2453148000 7200 0 EET}
+    {2468872800 10800 1 EEST}
+    {2484597600 7200 0 EET}
+    {2500322400 10800 1 EEST}
+    {2516047200 7200 0 EET}
+    {2532376800 10800 1 EEST}
+    {2547496800 7200 0 EET}
+    {2563826400 10800 1 EEST}
+    {2578946400 7200 0 EET}
+    {2595276000 10800 1 EEST}
+    {2611000800 7200 0 EET}
+    {2626725600 10800 1 EEST}
+    {2642450400 7200 0 EET}
+    {2658175200 10800 1 EEST}
+    {2673900000 7200 0 EET}
+    {2689624800 10800 1 EEST}
+    {2705349600 7200 0 EET}
+    {2721679200 10800 1 EEST}
+    {2736799200 7200 0 EET}
+    {2753128800 10800 1 EEST}
+    {2768248800 7200 0 EET}
+    {2784578400 10800 1 EEST}
+    {2800303200 7200 0 EET}
+    {2816028000 10800 1 EEST}
+    {2831752800 7200 0 EET}
+    {2847477600 10800 1 EEST}
+    {2863202400 7200 0 EET}
+    {2879532000 10800 1 EEST}
+    {2894652000 7200 0 EET}
+    {2910981600 10800 1 EEST}
+    {2926101600 7200 0 EET}
+    {2942431200 10800 1 EEST}
+    {2957551200 7200 0 EET}
+    {2973880800 10800 1 EEST}
+    {2989605600 7200 0 EET}
+    {3005330400 10800 1 EEST}
+    {3021055200 7200 0 EET}
+    {3036780000 10800 1 EEST}
+    {3052504800 7200 0 EET}
+    {3068834400 10800 1 EEST}
+    {3083954400 7200 0 EET}
+    {3100284000 10800 1 EEST}
+    {3115404000 7200 0 EET}
+    {3131733600 10800 1 EEST}
+    {3147458400 7200 0 EET}
+    {3163183200 10800 1 EEST}
+    {3178908000 7200 0 EET}
+    {3194632800 10800 1 EEST}
+    {3210357600 7200 0 EET}
+    {3226687200 10800 1 EEST}
+    {3241807200 7200 0 EET}
+    {3258136800 10800 1 EEST}
+    {3273256800 7200 0 EET}
+    {3289586400 10800 1 EEST}
+    {3304706400 7200 0 EET}
+    {3321036000 10800 1 EEST}
+    {3336760800 7200 0 EET}
+    {3352485600 10800 1 EEST}
+    {3368210400 7200 0 EET}
+    {3383935200 10800 1 EEST}
+    {3399660000 7200 0 EET}
+    {3415989600 10800 1 EEST}
+    {3431109600 7200 0 EET}
+    {3447439200 10800 1 EEST}
+    {3462559200 7200 0 EET}
+    {3478888800 10800 1 EEST}
+    {3494613600 7200 0 EET}
+    {3510338400 10800 1 EEST}
+    {3526063200 7200 0 EET}
+    {3541788000 10800 1 EEST}
+    {3557512800 7200 0 EET}
+    {3573237600 10800 1 EEST}
+    {3588962400 7200 0 EET}
+    {3605292000 10800 1 EEST}
+    {3620412000 7200 0 EET}
+    {3636741600 10800 1 EEST}
+    {3651861600 7200 0 EET}
+    {3668191200 10800 1 EEST}
+    {3683916000 7200 0 EET}
+    {3699640800 10800 1 EEST}
+    {3715365600 7200 0 EET}
+    {3731090400 10800 1 EEST}
+    {3746815200 7200 0 EET}
+    {3763144800 10800 1 EEST}
+    {3778264800 7200 0 EET}
+    {3794594400 10800 1 EEST}
+    {3809714400 7200 0 EET}
+    {3826044000 10800 1 EEST}
+    {3841164000 7200 0 EET}
+    {3857493600 10800 1 EEST}
+    {3873218400 7200 0 EET}
+    {3888943200 10800 1 EEST}
+    {3904668000 7200 0 EET}
+    {3920392800 10800 1 EEST}
+    {3936117600 7200 0 EET}
+    {3952447200 10800 1 EEST}
+    {3967567200 7200 0 EET}
+    {3983896800 10800 1 EEST}
+    {3999016800 7200 0 EET}
+    {4015346400 10800 1 EEST}
+    {4031071200 7200 0 EET}
+    {4046796000 10800 1 EEST}
+    {4062520800 7200 0 EET}
+    {4078245600 10800 1 EEST}
+    {4093970400 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hong_Kong b/library/tzdata/Asia/Hong_Kong
index 928cde6..fcf98a6 100644
--- a/library/tzdata/Asia/Hong_Kong
+++ b/library/tzdata/Asia/Hong_Kong
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Hong_Kong) {
-    {-9223372036854775808 27396 0 LMT}
-    {-2056692996 28800 0 HKT}
+    {-9223372036854775808 27402 0 LMT}
+    {-2056693002 28800 0 HKT}
     {-907389000 32400 1 HKST}
     {-891667800 28800 0 HKT}
     {-884246400 32400 0 JST}
diff --git a/library/tzdata/Asia/Jerusalem b/library/tzdata/Asia/Jerusalem
index 613eadd..7662680 100644
--- a/library/tzdata/Asia/Jerusalem
+++ b/library/tzdata/Asia/Jerusalem
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Jerusalem) {
-    {-9223372036854775808 8456 0 LMT}
-    {-2840149256 8440 0 JMT}
+    {-9223372036854775808 8454 0 LMT}
+    {-2840149254 8440 0 JMT}
     {-1641003640 7200 0 IST}
     {-933645600 10800 1 IDT}
     {-857358000 7200 0 IST}
@@ -96,177 +96,177 @@ set TZData(:Asia/Jerusalem) {
     {1333065600 10800 1 IDT}
     {1348354800 7200 0 IST}
     {1364515200 10800 1 IDT}
-    {1381014000 7200 0 IST}
+    {1382828400 7200 0 IST}
     {1395964800 10800 1 IDT}
-    {1412463600 7200 0 IST}
+    {1414278000 7200 0 IST}
     {1427414400 10800 1 IDT}
-    {1443913200 7200 0 IST}
+    {1445727600 7200 0 IST}
     {1458864000 10800 1 IDT}
-    {1475362800 7200 0 IST}
+    {1477782000 7200 0 IST}
     {1490313600 10800 1 IDT}
-    {1507417200 7200 0 IST}
+    {1509231600 7200 0 IST}
     {1521763200 10800 1 IDT}
-    {1538866800 7200 0 IST}
+    {1540681200 7200 0 IST}
     {1553817600 10800 1 IDT}
-    {1570316400 7200 0 IST}
+    {1572130800 7200 0 IST}
     {1585267200 10800 1 IDT}
-    {1601766000 7200 0 IST}
+    {1603580400 7200 0 IST}
     {1616716800 10800 1 IDT}
-    {1633215600 7200 0 IST}
+    {1635634800 7200 0 IST}
     {1648166400 10800 1 IDT}
-    {1664665200 7200 0 IST}
+    {1667084400 7200 0 IST}
     {1679616000 10800 1 IDT}
-    {1696719600 7200 0 IST}
+    {1698534000 7200 0 IST}
     {1711670400 10800 1 IDT}
-    {1728169200 7200 0 IST}
+    {1729983600 7200 0 IST}
     {1743120000 10800 1 IDT}
-    {1759618800 7200 0 IST}
+    {1761433200 7200 0 IST}
     {1774569600 10800 1 IDT}
-    {1791068400 7200 0 IST}
+    {1792882800 7200 0 IST}
     {1806019200 10800 1 IDT}
-    {1822604400 7200 0 IST}
+    {1824937200 7200 0 IST}
     {1837468800 10800 1 IDT}
-    {1854572400 7200 0 IST}
+    {1856386800 7200 0 IST}
     {1868918400 10800 1 IDT}
-    {1886022000 7200 0 IST}
+    {1887836400 7200 0 IST}
     {1900972800 10800 1 IDT}
-    {1917471600 7200 0 IST}
+    {1919286000 7200 0 IST}
     {1932422400 10800 1 IDT}
-    {1948921200 7200 0 IST}
+    {1950735600 7200 0 IST}
     {1963872000 10800 1 IDT}
-    {1980370800 7200 0 IST}
+    {1982790000 7200 0 IST}
     {1995321600 10800 1 IDT}
-    {2011820400 7200 0 IST}
+    {2014239600 7200 0 IST}
     {2026771200 10800 1 IDT}
-    {2043874800 7200 0 IST}
+    {2045689200 7200 0 IST}
     {2058220800 10800 1 IDT}
-    {2075324400 7200 0 IST}
+    {2077138800 7200 0 IST}
     {2090275200 10800 1 IDT}
-    {2106774000 7200 0 IST}
+    {2108588400 7200 0 IST}
     {2121724800 10800 1 IDT}
-    {2138223600 7200 0 IST}
+    {2140038000 7200 0 IST}
     {2153174400 10800 1 IDT}
-    {2169673200 7200 0 IST}
+    {2172092400 7200 0 IST}
     {2184624000 10800 1 IDT}
-    {2201122800 7200 0 IST}
+    {2203542000 7200 0 IST}
     {2216073600 10800 1 IDT}
-    {2233177200 7200 0 IST}
+    {2234991600 7200 0 IST}
     {2248128000 10800 1 IDT}
-    {2264626800 7200 0 IST}
+    {2266441200 7200 0 IST}
     {2279577600 10800 1 IDT}
-    {2296076400 7200 0 IST}
+    {2297890800 7200 0 IST}
     {2311027200 10800 1 IDT}
-    {2327526000 7200 0 IST}
+    {2329340400 7200 0 IST}
     {2342476800 10800 1 IDT}
-    {2358975600 7200 0 IST}
+    {2361394800 7200 0 IST}
     {2373926400 10800 1 IDT}
-    {2391030000 7200 0 IST}
+    {2392844400 7200 0 IST}
     {2405376000 10800 1 IDT}
-    {2422479600 7200 0 IST}
+    {2424294000 7200 0 IST}
     {2437430400 10800 1 IDT}
-    {2453929200 7200 0 IST}
+    {2455743600 7200 0 IST}
     {2468880000 10800 1 IDT}
-    {2485378800 7200 0 IST}
+    {2487193200 7200 0 IST}
     {2500329600 10800 1 IDT}
-    {2516828400 7200 0 IST}
+    {2519247600 7200 0 IST}
     {2531779200 10800 1 IDT}
-    {2548278000 7200 0 IST}
+    {2550697200 7200 0 IST}
     {2563228800 10800 1 IDT}
-    {2580332400 7200 0 IST}
+    {2582146800 7200 0 IST}
     {2595283200 10800 1 IDT}
-    {2611782000 7200 0 IST}
+    {2613596400 7200 0 IST}
     {2626732800 10800 1 IDT}
-    {2643231600 7200 0 IST}
+    {2645046000 7200 0 IST}
     {2658182400 10800 1 IDT}
-    {2674681200 7200 0 IST}
+    {2676495600 7200 0 IST}
     {2689632000 10800 1 IDT}
-    {2706130800 7200 0 IST}
+    {2708550000 7200 0 IST}
     {2721081600 10800 1 IDT}
-    {2738185200 7200 0 IST}
+    {2739999600 7200 0 IST}
     {2752531200 10800 1 IDT}
-    {2769634800 7200 0 IST}
+    {2771449200 7200 0 IST}
     {2784585600 10800 1 IDT}
-    {2801084400 7200 0 IST}
+    {2802898800 7200 0 IST}
     {2816035200 10800 1 IDT}
-    {2832534000 7200 0 IST}
+    {2834348400 7200 0 IST}
     {2847484800 10800 1 IDT}
-    {2863983600 7200 0 IST}
+    {2866402800 7200 0 IST}
     {2878934400 10800 1 IDT}
-    {2895433200 7200 0 IST}
+    {2897852400 7200 0 IST}
     {2910384000 10800 1 IDT}
-    {2927487600 7200 0 IST}
+    {2929302000 7200 0 IST}
     {2941833600 10800 1 IDT}
-    {2958937200 7200 0 IST}
+    {2960751600 7200 0 IST}
     {2973888000 10800 1 IDT}
-    {2990386800 7200 0 IST}
+    {2992201200 7200 0 IST}
     {3005337600 10800 1 IDT}
-    {3021836400 7200 0 IST}
+    {3023650800 7200 0 IST}
     {3036787200 10800 1 IDT}
-    {3053286000 7200 0 IST}
+    {3055705200 7200 0 IST}
     {3068236800 10800 1 IDT}
-    {3084735600 7200 0 IST}
+    {3087154800 7200 0 IST}
     {3099686400 10800 1 IDT}
-    {3116790000 7200 0 IST}
+    {3118604400 7200 0 IST}
     {3131740800 10800 1 IDT}
-    {3148239600 7200 0 IST}
+    {3150054000 7200 0 IST}
     {3163190400 10800 1 IDT}
-    {3179689200 7200 0 IST}
+    {3181503600 7200 0 IST}
     {3194640000 10800 1 IDT}
-    {3211138800 7200 0 IST}
+    {3212953200 7200 0 IST}
     {3226089600 10800 1 IDT}
-    {3242588400 7200 0 IST}
+    {3245007600 7200 0 IST}
     {3257539200 10800 1 IDT}
-    {3274642800 7200 0 IST}
+    {3276457200 7200 0 IST}
     {3288988800 10800 1 IDT}
-    {3306092400 7200 0 IST}
+    {3307906800 7200 0 IST}
     {3321043200 10800 1 IDT}
-    {3337542000 7200 0 IST}
+    {3339356400 7200 0 IST}
     {3352492800 10800 1 IDT}
-    {3368991600 7200 0 IST}
+    {3370806000 7200 0 IST}
     {3383942400 10800 1 IDT}
-    {3400441200 7200 0 IST}
+    {3402860400 7200 0 IST}
     {3415392000 10800 1 IDT}
-    {3431890800 7200 0 IST}
+    {3434310000 7200 0 IST}
     {3446841600 10800 1 IDT}
-    {3463945200 7200 0 IST}
+    {3465759600 7200 0 IST}
     {3478896000 10800 1 IDT}
-    {3495394800 7200 0 IST}
+    {3497209200 7200 0 IST}
     {3510345600 10800 1 IDT}
-    {3526844400 7200 0 IST}
+    {3528658800 7200 0 IST}
     {3541795200 10800 1 IDT}
-    {3558294000 7200 0 IST}
+    {3560108400 7200 0 IST}
     {3573244800 10800 1 IDT}
-    {3589743600 7200 0 IST}
+    {3592162800 7200 0 IST}
     {3604694400 10800 1 IDT}
-    {3621798000 7200 0 IST}
+    {3623612400 7200 0 IST}
     {3636144000 10800 1 IDT}
-    {3653247600 7200 0 IST}
+    {3655062000 7200 0 IST}
     {3668198400 10800 1 IDT}
-    {3684697200 7200 0 IST}
+    {3686511600 7200 0 IST}
     {3699648000 10800 1 IDT}
-    {3716146800 7200 0 IST}
+    {3717961200 7200 0 IST}
     {3731097600 10800 1 IDT}
-    {3747596400 7200 0 IST}
+    {3750015600 7200 0 IST}
     {3762547200 10800 1 IDT}
-    {3779046000 7200 0 IST}
+    {3781465200 7200 0 IST}
     {3793996800 10800 1 IDT}
-    {3811100400 7200 0 IST}
+    {3812914800 7200 0 IST}
     {3825446400 10800 1 IDT}
-    {3842550000 7200 0 IST}
+    {3844364400 7200 0 IST}
     {3857500800 10800 1 IDT}
-    {3873999600 7200 0 IST}
+    {3875814000 7200 0 IST}
     {3888950400 10800 1 IDT}
-    {3905449200 7200 0 IST}
+    {3907263600 7200 0 IST}
     {3920400000 10800 1 IDT}
-    {3936898800 7200 0 IST}
+    {3939318000 7200 0 IST}
     {3951849600 10800 1 IDT}
-    {3968348400 7200 0 IST}
+    {3970767600 7200 0 IST}
     {3983299200 10800 1 IDT}
-    {4000402800 7200 0 IST}
+    {4002217200 7200 0 IST}
     {4015353600 10800 1 IDT}
-    {4031852400 7200 0 IST}
+    {4033666800 7200 0 IST}
     {4046803200 10800 1 IDT}
-    {4063302000 7200 0 IST}
+    {4065116400 7200 0 IST}
     {4078252800 10800 1 IDT}
-    {4094751600 7200 0 IST}
+    {4096566000 7200 0 IST}
 }
diff --git a/library/tzdata/Asia/Khandyga b/library/tzdata/Asia/Khandyga
new file mode 100644
index 0000000..2464b9f
--- /dev/null
+++ b/library/tzdata/Asia/Khandyga
@@ -0,0 +1,72 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Asia/Khandyga) {
+    {-9223372036854775808 32533 0 LMT}
+    {-1579424533 28800 0 YAKT}
+    {-1247558400 32400 0 YAKMMTT}
+    {354898800 36000 1 YAKST}
+    {370706400 32400 0 YAKT}
+    {386434800 36000 1 YAKST}
+    {402242400 32400 0 YAKT}
+    {417970800 36000 1 YAKST}
+    {433778400 32400 0 YAKT}
+    {449593200 36000 1 YAKST}
+    {465325200 32400 0 YAKT}
+    {481050000 36000 1 YAKST}
+    {496774800 32400 0 YAKT}
+    {512499600 36000 1 YAKST}
+    {528224400 32400 0 YAKT}
+    {543949200 36000 1 YAKST}
+    {559674000 32400 0 YAKT}
+    {575398800 36000 1 YAKST}
+    {591123600 32400 0 YAKT}
+    {606848400 36000 1 YAKST}
+    {622573200 32400 0 YAKT}
+    {638298000 36000 1 YAKST}
+    {654627600 32400 0 YAKT}
+    {670352400 28800 0 YAKMMTT}
+    {670356000 32400 1 YAKST}
+    {686080800 28800 0 YAKT}
+    {695757600 32400 0 YAKMMTT}
+    {701791200 36000 1 YAKST}
+    {717512400 32400 0 YAKT}
+    {733251600 36000 1 YAKST}
+    {748976400 32400 0 YAKT}
+    {764701200 36000 1 YAKST}
+    {780426000 32400 0 YAKT}
+    {796150800 36000 1 YAKST}
+    {811875600 32400 0 YAKT}
+    {828205200 36000 1 YAKST}
+    {846349200 32400 0 YAKT}
+    {859654800 36000 1 YAKST}
+    {877798800 32400 0 YAKT}
+    {891104400 36000 1 YAKST}
+    {909248400 32400 0 YAKT}
+    {922554000 36000 1 YAKST}
+    {941302800 32400 0 YAKT}
+    {954003600 36000 1 YAKST}
+    {972752400 32400 0 YAKT}
+    {985453200 36000 1 YAKST}
+    {1004202000 32400 0 YAKT}
+    {1017507600 36000 1 YAKST}
+    {1035651600 32400 0 YAKT}
+    {1048957200 36000 1 YAKST}
+    {1067101200 32400 0 YAKT}
+    {1072882800 36000 0 VLAMMTT}
+    {1080403200 39600 1 VLAST}
+    {1099152000 36000 0 VLAT}
+    {1111852800 39600 1 VLAST}
+    {1130601600 36000 0 VLAT}
+    {1143302400 39600 1 VLAST}
+    {1162051200 36000 0 VLAT}
+    {1174752000 39600 1 VLAST}
+    {1193500800 36000 0 VLAT}
+    {1206806400 39600 1 VLAST}
+    {1224950400 36000 0 VLAT}
+    {1238256000 39600 1 VLAST}
+    {1256400000 36000 0 VLAT}
+    {1269705600 39600 1 VLAST}
+    {1288454400 36000 0 VLAT}
+    {1301155200 39600 0 VLAT}
+    {1315832400 36000 0 YAKT}
+}
diff --git a/library/tzdata/Asia/Muscat b/library/tzdata/Asia/Muscat
index 21b5873..a69b880 100644
--- a/library/tzdata/Asia/Muscat
+++ b/library/tzdata/Asia/Muscat
@@ -1,6 +1,6 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Muscat) {
-    {-9223372036854775808 14060 0 LMT}
-    {-1577937260 14400 0 GST}
+    {-9223372036854775808 14064 0 LMT}
+    {-1577937264 14400 0 GST}
 }
diff --git a/library/tzdata/Asia/Rangoon b/library/tzdata/Asia/Rangoon
index 2b8c4fa..4f3ac02 100644
--- a/library/tzdata/Asia/Rangoon
+++ b/library/tzdata/Asia/Rangoon
@@ -2,8 +2,8 @@
 
 set TZData(:Asia/Rangoon) {
     {-9223372036854775808 23080 0 LMT}
-    {-2840163880 23076 0 RMT}
-    {-1577946276 23400 0 BURT}
+    {-2840163880 23080 0 RMT}
+    {-1577946280 23400 0 BURT}
     {-873268200 32400 0 JST}
     {-778410000 23400 0 MMT}
 }
diff --git a/library/tzdata/Asia/Shanghai b/library/tzdata/Asia/Shanghai
index aa7dc58..4b3cc3b 100644
--- a/library/tzdata/Asia/Shanghai
+++ b/library/tzdata/Asia/Shanghai
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Asia/Shanghai) {
-    {-9223372036854775808 29152 0 LMT}
-    {-1325491552 28800 0 CST}
+    {-9223372036854775808 29157 0 LMT}
+    {-1325491557 28800 0 CST}
     {-933494400 32400 1 CDT}
     {-923130000 28800 0 CST}
     {-908784000 32400 1 CDT}
diff --git a/library/tzdata/Asia/Ust-Nera b/library/tzdata/Asia/Ust-Nera
new file mode 100644
index 0000000..c8de7a5
--- /dev/null
+++ b/library/tzdata/Asia/Ust-Nera
@@ -0,0 +1,70 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Asia/Ust-Nera) {
+    {-9223372036854775808 34374 0 LMT}
+    {-1579426374 28800 0 YAKT}
+    {354898800 43200 0 MAGST}
+    {370699200 39600 0 MAGT}
+    {386427600 43200 1 MAGST}
+    {402235200 39600 0 MAGT}
+    {417963600 43200 1 MAGST}
+    {433771200 39600 0 MAGT}
+    {449586000 43200 1 MAGST}
+    {465318000 39600 0 MAGT}
+    {481042800 43200 1 MAGST}
+    {496767600 39600 0 MAGT}
+    {512492400 43200 1 MAGST}
+    {528217200 39600 0 MAGT}
+    {543942000 43200 1 MAGST}
+    {559666800 39600 0 MAGT}
+    {575391600 43200 1 MAGST}
+    {591116400 39600 0 MAGT}
+    {606841200 43200 1 MAGST}
+    {622566000 39600 0 MAGT}
+    {638290800 43200 1 MAGST}
+    {654620400 39600 0 MAGT}
+    {670345200 36000 0 MAGMMTT}
+    {670348800 39600 1 MAGST}
+    {686073600 36000 0 MAGT}
+    {695750400 39600 0 MAGMMTT}
+    {701784000 43200 1 MAGST}
+    {717505200 39600 0 MAGT}
+    {733244400 43200 1 MAGST}
+    {748969200 39600 0 MAGT}
+    {764694000 43200 1 MAGST}
+    {780418800 39600 0 MAGT}
+    {796143600 43200 1 MAGST}
+    {811868400 39600 0 MAGT}
+    {828198000 43200 1 MAGST}
+    {846342000 39600 0 MAGT}
+    {859647600 43200 1 MAGST}
+    {877791600 39600 0 MAGT}
+    {891097200 43200 1 MAGST}
+    {909241200 39600 0 MAGT}
+    {922546800 43200 1 MAGST}
+    {941295600 39600 0 MAGT}
+    {953996400 43200 1 MAGST}
+    {972745200 39600 0 MAGT}
+    {985446000 43200 1 MAGST}
+    {1004194800 39600 0 MAGT}
+    {1017500400 43200 1 MAGST}
+    {1035644400 39600 0 MAGT}
+    {1048950000 43200 1 MAGST}
+    {1067094000 39600 0 MAGT}
+    {1080399600 43200 1 MAGST}
+    {1099148400 39600 0 MAGT}
+    {1111849200 43200 1 MAGST}
+    {1130598000 39600 0 MAGT}
+    {1143298800 43200 1 MAGST}
+    {1162047600 39600 0 MAGT}
+    {1174748400 43200 1 MAGST}
+    {1193497200 39600 0 MAGT}
+    {1206802800 43200 1 MAGST}
+    {1224946800 39600 0 MAGT}
+    {1238252400 43200 1 MAGST}
+    {1256396400 39600 0 MAGT}
+    {1269702000 43200 1 MAGST}
+    {1288450800 39600 0 MAGT}
+    {1301151600 43200 0 MAGT}
+    {1315828800 39600 0 VLAT}
+}
diff --git a/library/tzdata/Atlantic/Bermuda b/library/tzdata/Atlantic/Bermuda
index e8b165a..2d4d983 100644
--- a/library/tzdata/Atlantic/Bermuda
+++ b/library/tzdata/Atlantic/Bermuda
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Atlantic/Bermuda) {
-    {-9223372036854775808 -15544 0 LMT}
-    {-1262281256 -14400 0 AST}
+    {-9223372036854775808 -15558 0 LMT}
+    {-1262281242 -14400 0 AST}
     {136360800 -10800 0 ADT}
     {152082000 -14400 0 AST}
     {167810400 -10800 1 ADT}
diff --git a/library/tzdata/Europe/Busingen b/library/tzdata/Europe/Busingen
new file mode 100644
index 0000000..62abc29
--- /dev/null
+++ b/library/tzdata/Europe/Busingen
@@ -0,0 +1,5 @@
+# created by tools/tclZIC.tcl - do not edit
+if {![info exists TZData(Europe/Zurich)]} {
+    LoadTimeZoneFile Europe/Zurich
+}
+set TZData(:Europe/Busingen) $TZData(:Europe/Zurich)
diff --git a/library/tzdata/Europe/Vienna b/library/tzdata/Europe/Vienna
index 41d744d..95283eb 100644
--- a/library/tzdata/Europe/Vienna
+++ b/library/tzdata/Europe/Vienna
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Europe/Vienna) {
-    {-9223372036854775808 3920 0 LMT}
-    {-2422055120 3600 0 CET}
+    {-9223372036854775808 3921 0 LMT}
+    {-2422055121 3600 0 CET}
     {-1693706400 7200 1 CEST}
     {-1680483600 3600 0 CET}
     {-1663455600 7200 1 CEST}
diff --git a/library/tzdata/Pacific/Easter b/library/tzdata/Pacific/Easter
index 38795fb..000c6d1 100644
--- a/library/tzdata/Pacific/Easter
+++ b/library/tzdata/Pacific/Easter
@@ -98,178 +98,178 @@ set TZData(:Pacific/Easter) {
     {1313899200 -18000 1 EASST}
     {1335668400 -21600 0 EAST}
     {1346558400 -18000 1 EASST}
-    {1362884400 -21600 0 EAST}
-    {1381636800 -18000 1 EASST}
-    {1394334000 -21600 0 EAST}
-    {1413086400 -18000 1 EASST}
-    {1426388400 -21600 0 EAST}
-    {1444536000 -18000 1 EASST}
-    {1457838000 -21600 0 EAST}
-    {1475985600 -18000 1 EASST}
-    {1489287600 -21600 0 EAST}
-    {1508040000 -18000 1 EASST}
-    {1520737200 -21600 0 EAST}
-    {1539489600 -18000 1 EASST}
-    {1552186800 -21600 0 EAST}
-    {1570939200 -18000 1 EASST}
-    {1584241200 -21600 0 EAST}
-    {1602388800 -18000 1 EASST}
-    {1615690800 -21600 0 EAST}
-    {1633838400 -18000 1 EASST}
-    {1647140400 -21600 0 EAST}
-    {1665288000 -18000 1 EASST}
-    {1678590000 -21600 0 EAST}
-    {1697342400 -18000 1 EASST}
-    {1710039600 -21600 0 EAST}
-    {1728792000 -18000 1 EASST}
-    {1741489200 -21600 0 EAST}
-    {1760241600 -18000 1 EASST}
-    {1773543600 -21600 0 EAST}
-    {1791691200 -18000 1 EASST}
-    {1804993200 -21600 0 EAST}
-    {1823140800 -18000 1 EASST}
-    {1836442800 -21600 0 EAST}
-    {1855195200 -18000 1 EASST}
-    {1867892400 -21600 0 EAST}
-    {1886644800 -18000 1 EASST}
-    {1899342000 -21600 0 EAST}
-    {1918094400 -18000 1 EASST}
-    {1930791600 -21600 0 EAST}
-    {1949544000 -18000 1 EASST}
-    {1962846000 -21600 0 EAST}
-    {1980993600 -18000 1 EASST}
-    {1994295600 -21600 0 EAST}
-    {2012443200 -18000 1 EASST}
-    {2025745200 -21600 0 EAST}
-    {2044497600 -18000 1 EASST}
-    {2057194800 -21600 0 EAST}
-    {2075947200 -18000 1 EASST}
-    {2088644400 -21600 0 EAST}
-    {2107396800 -18000 1 EASST}
-    {2120698800 -21600 0 EAST}
-    {2138846400 -18000 1 EASST}
-    {2152148400 -21600 0 EAST}
-    {2170296000 -18000 1 EASST}
-    {2183598000 -21600 0 EAST}
-    {2201745600 -18000 1 EASST}
-    {2215047600 -21600 0 EAST}
-    {2233800000 -18000 1 EASST}
-    {2246497200 -21600 0 EAST}
-    {2265249600 -18000 1 EASST}
-    {2277946800 -21600 0 EAST}
-    {2296699200 -18000 1 EASST}
-    {2310001200 -21600 0 EAST}
-    {2328148800 -18000 1 EASST}
-    {2341450800 -21600 0 EAST}
-    {2359598400 -18000 1 EASST}
-    {2372900400 -21600 0 EAST}
-    {2391652800 -18000 1 EASST}
-    {2404350000 -21600 0 EAST}
-    {2423102400 -18000 1 EASST}
-    {2435799600 -21600 0 EAST}
-    {2454552000 -18000 1 EASST}
-    {2467854000 -21600 0 EAST}
-    {2486001600 -18000 1 EASST}
-    {2499303600 -21600 0 EAST}
-    {2517451200 -18000 1 EASST}
-    {2530753200 -21600 0 EAST}
-    {2548900800 -18000 1 EASST}
-    {2562202800 -21600 0 EAST}
-    {2580955200 -18000 1 EASST}
-    {2593652400 -21600 0 EAST}
-    {2612404800 -18000 1 EASST}
-    {2625102000 -21600 0 EAST}
-    {2643854400 -18000 1 EASST}
-    {2657156400 -21600 0 EAST}
-    {2675304000 -18000 1 EASST}
-    {2688606000 -21600 0 EAST}
-    {2706753600 -18000 1 EASST}
-    {2720055600 -21600 0 EAST}
-    {2738808000 -18000 1 EASST}
-    {2751505200 -21600 0 EAST}
-    {2770257600 -18000 1 EASST}
-    {2782954800 -21600 0 EAST}
-    {2801707200 -18000 1 EASST}
-    {2814404400 -21600 0 EAST}
-    {2833156800 -18000 1 EASST}
-    {2846458800 -21600 0 EAST}
-    {2864606400 -18000 1 EASST}
-    {2877908400 -21600 0 EAST}
-    {2896056000 -18000 1 EASST}
-    {2909358000 -21600 0 EAST}
-    {2928110400 -18000 1 EASST}
-    {2940807600 -21600 0 EAST}
-    {2959560000 -18000 1 EASST}
-    {2972257200 -21600 0 EAST}
-    {2991009600 -18000 1 EASST}
-    {3004311600 -21600 0 EAST}
-    {3022459200 -18000 1 EASST}
-    {3035761200 -21600 0 EAST}
-    {3053908800 -18000 1 EASST}
-    {3067210800 -21600 0 EAST}
-    {3085358400 -18000 1 EASST}
-    {3098660400 -21600 0 EAST}
-    {3117412800 -18000 1 EASST}
-    {3130110000 -21600 0 EAST}
-    {3148862400 -18000 1 EASST}
-    {3161559600 -21600 0 EAST}
-    {3180312000 -18000 1 EASST}
-    {3193614000 -21600 0 EAST}
-    {3211761600 -18000 1 EASST}
-    {3225063600 -21600 0 EAST}
-    {3243211200 -18000 1 EASST}
-    {3256513200 -21600 0 EAST}
-    {3275265600 -18000 1 EASST}
-    {3287962800 -21600 0 EAST}
-    {3306715200 -18000 1 EASST}
-    {3319412400 -21600 0 EAST}
-    {3338164800 -18000 1 EASST}
-    {3351466800 -21600 0 EAST}
-    {3369614400 -18000 1 EASST}
-    {3382916400 -21600 0 EAST}
-    {3401064000 -18000 1 EASST}
-    {3414366000 -21600 0 EAST}
-    {3432513600 -18000 1 EASST}
-    {3445815600 -21600 0 EAST}
-    {3464568000 -18000 1 EASST}
-    {3477265200 -21600 0 EAST}
-    {3496017600 -18000 1 EASST}
-    {3508714800 -21600 0 EAST}
-    {3527467200 -18000 1 EASST}
-    {3540769200 -21600 0 EAST}
-    {3558916800 -18000 1 EASST}
-    {3572218800 -21600 0 EAST}
-    {3590366400 -18000 1 EASST}
-    {3603668400 -21600 0 EAST}
-    {3622420800 -18000 1 EASST}
-    {3635118000 -21600 0 EAST}
-    {3653870400 -18000 1 EASST}
-    {3666567600 -21600 0 EAST}
-    {3685320000 -18000 1 EASST}
-    {3698017200 -21600 0 EAST}
-    {3716769600 -18000 1 EASST}
-    {3730071600 -21600 0 EAST}
-    {3748219200 -18000 1 EASST}
-    {3761521200 -21600 0 EAST}
-    {3779668800 -18000 1 EASST}
-    {3792970800 -21600 0 EAST}
-    {3811723200 -18000 1 EASST}
-    {3824420400 -21600 0 EAST}
-    {3843172800 -18000 1 EASST}
-    {3855870000 -21600 0 EAST}
-    {3874622400 -18000 1 EASST}
-    {3887924400 -21600 0 EAST}
-    {3906072000 -18000 1 EASST}
-    {3919374000 -21600 0 EAST}
-    {3937521600 -18000 1 EASST}
-    {3950823600 -21600 0 EAST}
-    {3968971200 -18000 1 EASST}
-    {3982273200 -21600 0 EAST}
-    {4001025600 -18000 1 EASST}
-    {4013722800 -21600 0 EAST}
-    {4032475200 -18000 1 EASST}
-    {4045172400 -21600 0 EAST}
-    {4063924800 -18000 1 EASST}
-    {4077226800 -21600 0 EAST}
-    {4095374400 -18000 1 EASST}
+    {1367118000 -21600 0 EAST}
+    {1378612800 -18000 1 EASST}
+    {1398567600 -21600 0 EAST}
+    {1410062400 -18000 1 EASST}
+    {1430017200 -21600 0 EAST}
+    {1441512000 -18000 1 EASST}
+    {1461466800 -21600 0 EAST}
+    {1472961600 -18000 1 EASST}
+    {1492916400 -21600 0 EAST}
+    {1504411200 -18000 1 EASST}
+    {1524970800 -21600 0 EAST}
+    {1535860800 -18000 1 EASST}
+    {1556420400 -21600 0 EAST}
+    {1567915200 -18000 1 EASST}
+    {1587870000 -21600 0 EAST}
+    {1599364800 -18000 1 EASST}
+    {1619319600 -21600 0 EAST}
+    {1630814400 -18000 1 EASST}
+    {1650769200 -21600 0 EAST}
+    {1662264000 -18000 1 EASST}
+    {1682218800 -21600 0 EAST}
+    {1693713600 -18000 1 EASST}
+    {1714273200 -21600 0 EAST}
+    {1725768000 -18000 1 EASST}
+    {1745722800 -21600 0 EAST}
+    {1757217600 -18000 1 EASST}
+    {1777172400 -21600 0 EAST}
+    {1788667200 -18000 1 EASST}
+    {1808622000 -21600 0 EAST}
+    {1820116800 -18000 1 EASST}
+    {1840071600 -21600 0 EAST}
+    {1851566400 -18000 1 EASST}
+    {1872126000 -21600 0 EAST}
+    {1883016000 -18000 1 EASST}
+    {1903575600 -21600 0 EAST}
+    {1915070400 -18000 1 EASST}
+    {1935025200 -21600 0 EAST}
+    {1946520000 -18000 1 EASST}
+    {1966474800 -21600 0 EAST}
+    {1977969600 -18000 1 EASST}
+    {1997924400 -21600 0 EAST}
+    {2009419200 -18000 1 EASST}
+    {2029374000 -21600 0 EAST}
+    {2040868800 -18000 1 EASST}
+    {2061428400 -21600 0 EAST}
+    {2072318400 -18000 1 EASST}
+    {2092878000 -21600 0 EAST}
+    {2104372800 -18000 1 EASST}
+    {2124327600 -21600 0 EAST}
+    {2135822400 -18000 1 EASST}
+    {2155777200 -21600 0 EAST}
+    {2167272000 -18000 1 EASST}
+    {2187226800 -21600 0 EAST}
+    {2198721600 -18000 1 EASST}
+    {2219281200 -21600 0 EAST}
+    {2230171200 -18000 1 EASST}
+    {2250730800 -21600 0 EAST}
+    {2262225600 -18000 1 EASST}
+    {2282180400 -21600 0 EAST}
+    {2293675200 -18000 1 EASST}
+    {2313630000 -21600 0 EAST}
+    {2325124800 -18000 1 EASST}
+    {2345079600 -21600 0 EAST}
+    {2356574400 -18000 1 EASST}
+    {2376529200 -21600 0 EAST}
+    {2388024000 -18000 1 EASST}
+    {2408583600 -21600 0 EAST}
+    {2419473600 -18000 1 EASST}
+    {2440033200 -21600 0 EAST}
+    {2451528000 -18000 1 EASST}
+    {2471482800 -21600 0 EAST}
+    {2482977600 -18000 1 EASST}
+    {2502932400 -21600 0 EAST}
+    {2514427200 -18000 1 EASST}
+    {2534382000 -21600 0 EAST}
+    {2545876800 -18000 1 EASST}
+    {2565831600 -21600 0 EAST}
+    {2577326400 -18000 1 EASST}
+    {2597886000 -21600 0 EAST}
+    {2609380800 -18000 1 EASST}
+    {2629335600 -21600 0 EAST}
+    {2640830400 -18000 1 EASST}
+    {2660785200 -21600 0 EAST}
+    {2672280000 -18000 1 EASST}
+    {2692234800 -21600 0 EAST}
+    {2703729600 -18000 1 EASST}
+    {2723684400 -21600 0 EAST}
+    {2735179200 -18000 1 EASST}
+    {2755738800 -21600 0 EAST}
+    {2766628800 -18000 1 EASST}
+    {2787188400 -21600 0 EAST}
+    {2798683200 -18000 1 EASST}
+    {2818638000 -21600 0 EAST}
+    {2830132800 -18000 1 EASST}
+    {2850087600 -21600 0 EAST}
+    {2861582400 -18000 1 EASST}
+    {2881537200 -21600 0 EAST}
+    {2893032000 -18000 1 EASST}
+    {2912986800 -21600 0 EAST}
+    {2924481600 -18000 1 EASST}
+    {2945041200 -21600 0 EAST}
+    {2955931200 -18000 1 EASST}
+    {2976490800 -21600 0 EAST}
+    {2987985600 -18000 1 EASST}
+    {3007940400 -21600 0 EAST}
+    {3019435200 -18000 1 EASST}
+    {3039390000 -21600 0 EAST}
+    {3050884800 -18000 1 EASST}
+    {3070839600 -21600 0 EAST}
+    {3082334400 -18000 1 EASST}
+    {3102894000 -21600 0 EAST}
+    {3113784000 -18000 1 EASST}
+    {3134343600 -21600 0 EAST}
+    {3145838400 -18000 1 EASST}
+    {3165793200 -21600 0 EAST}
+    {3177288000 -18000 1 EASST}
+    {3197242800 -21600 0 EAST}
+    {3208737600 -18000 1 EASST}
+    {3228692400 -21600 0 EAST}
+    {3240187200 -18000 1 EASST}
+    {3260142000 -21600 0 EAST}
+    {3271636800 -18000 1 EASST}
+    {3292196400 -21600 0 EAST}
+    {3303086400 -18000 1 EASST}
+    {3323646000 -21600 0 EAST}
+    {3335140800 -18000 1 EASST}
+    {3355095600 -21600 0 EAST}
+    {3366590400 -18000 1 EASST}
+    {3386545200 -21600 0 EAST}
+    {3398040000 -18000 1 EASST}
+    {3417994800 -21600 0 EAST}
+    {3429489600 -18000 1 EASST}
+    {3449444400 -21600 0 EAST}
+    {3460939200 -18000 1 EASST}
+    {3481498800 -21600 0 EAST}
+    {3492993600 -18000 1 EASST}
+    {3512948400 -21600 0 EAST}
+    {3524443200 -18000 1 EASST}
+    {3544398000 -21600 0 EAST}
+    {3555892800 -18000 1 EASST}
+    {3575847600 -21600 0 EAST}
+    {3587342400 -18000 1 EASST}
+    {3607297200 -21600 0 EAST}
+    {3618792000 -18000 1 EASST}
+    {3639351600 -21600 0 EAST}
+    {3650241600 -18000 1 EASST}
+    {3670801200 -21600 0 EAST}
+    {3682296000 -18000 1 EASST}
+    {3702250800 -21600 0 EAST}
+    {3713745600 -18000 1 EASST}
+    {3733700400 -21600 0 EAST}
+    {3745195200 -18000 1 EASST}
+    {3765150000 -21600 0 EAST}
+    {3776644800 -18000 1 EASST}
+    {3796599600 -21600 0 EAST}
+    {3808094400 -18000 1 EASST}
+    {3828654000 -21600 0 EAST}
+    {3839544000 -18000 1 EASST}
+    {3860103600 -21600 0 EAST}
+    {3871598400 -18000 1 EASST}
+    {3891553200 -21600 0 EAST}
+    {3903048000 -18000 1 EASST}
+    {3923002800 -21600 0 EAST}
+    {3934497600 -18000 1 EASST}
+    {3954452400 -21600 0 EAST}
+    {3965947200 -18000 1 EASST}
+    {3986506800 -21600 0 EAST}
+    {3997396800 -18000 1 EASST}
+    {4017956400 -21600 0 EAST}
+    {4029451200 -18000 1 EASST}
+    {4049406000 -21600 0 EAST}
+    {4060900800 -18000 1 EASST}
+    {4080855600 -21600 0 EAST}
+    {4092350400 -18000 1 EASST}
 }
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index e067377..bfcaa03 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -1,8 +1,8 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Pacific/Fiji) {
-    {-9223372036854775808 42820 0 LMT}
-    {-1709985220 43200 0 FJT}
+    {-9223372036854775808 42944 0 LMT}
+    {-1709985344 43200 0 FJT}
     {909842400 46800 1 FJST}
     {920124000 43200 0 FJT}
     {941896800 46800 1 FJST}
diff --git a/library/word.tcl b/library/word.tcl
index 16a4638..b8f34a5 100644
--- a/library/word.tcl
+++ b/library/word.tcl
@@ -67,7 +67,7 @@ namespace eval ::tcl {
 proc tcl_wordBreakAfter {str start} {
     variable ::tcl::WordBreakRE
     set result {-1 -1}
-    regexp -indices -start $start $WordBreakRE(after) $str result
+    regexp -indices -start $start -- $WordBreakRE(after) $str result
     return [lindex $result 1]
 }
 
@@ -85,7 +85,7 @@ proc tcl_wordBreakAfter {str start} {
 proc tcl_wordBreakBefore {str start} {
     variable ::tcl::WordBreakRE
     set result {-1 -1}
-    regexp -indices $WordBreakRE(before) [string range $str 0 $start] result
+    regexp -indices -- $WordBreakRE(before) [string range $str 0 $start] result
     return [lindex $result 1]
 }
 
@@ -104,7 +104,7 @@ proc tcl_wordBreakBefore {str start} {
 proc tcl_endOfWord {str start} {
     variable ::tcl::WordBreakRE
     set result {-1 -1}
-    regexp -indices -start $start $WordBreakRE(end) $str result
+    regexp -indices -start $start -- $WordBreakRE(end) $str result
     return [lindex $result 1]
 }
 
@@ -122,7 +122,7 @@ proc tcl_endOfWord {str start} {
 proc tcl_startOfNextWord {str start} {
     variable ::tcl::WordBreakRE
     set result {-1 -1}
-    regexp -indices -start $start $WordBreakRE(next) $str result
+    regexp -indices -start $start -- $WordBreakRE(next) $str result
     return [lindex $result 1]
 }
 
@@ -138,7 +138,7 @@ proc tcl_startOfNextWord {str start} {
 proc tcl_startOfPreviousWord {str start} {
     variable ::tcl::WordBreakRE
     set word {-1 -1}
-    regexp -indices $WordBreakRE(previous) [string range $str 0 $start-1] \
+    regexp -indices -- $WordBreakRE(previous) [string range $str 0 $start-1] \
 	    result word
     return [lindex $word 0]
 }