merge trunkmig_no280

61 files changed, 1630 insertions, 723 deletions

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 31c80a0..9ed86b1 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -18,6 +18,7 @@
 */tcltest*
 */versions.vc
 unix/dltest.marker
+unix/tcl.pc
 unix/pkgs/*
 win/pkgs/*
 win/tcl.hpj
diff --git a/ChangeLog b/ChangeLog
index 26a51d5..6330666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,91 @@
+2013-05-06  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclStubInit.c: Add support for Cygwin64, which has a 64-bit
+	* generic/tclDecls.h: "long" type. Binary compatibility with win64
+	requires that all stub entries use 32-bit long's, therefore the
+	need for various wrapper functions/macros. For Tcl 9 a better
+	solution is needed, but that cannot be done without introducing
+	binary incompatibility.
+
+2013-04-30  Andreas Kupries  <andreask@activestate.com>
+
+	* library/platform/platform.tcl (::platform::LibcVersion):
+	* library/platform/pkgIndex.tcl: Followup to the 2013-01-30
+	  change. The RE become too restrictive again. SuSe added a
+	  timestamp after the version. Loosened up a bit. Bumped package
+	  to version 1.0.12.
+
+2013-04-29  Donal K. Fellows  <dkf@users.sf.net>
+
+	* generic/tclCompCmds.c (TclCompileArraySetCmd): Generate better code
+	when the list of things to set is a literal.
+
+2013-04-25  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclDecls.h: Implement Tcl_NewBooleanObj, Tcl_DbNewBooleanObj
+	and Tcl_SetBooleanObj as macros using Tcl_NewIntObj, Tcl_DbNewLongObj
+	and Tcl_SetIntObj. Starting with Tcl 8.5, this is exactly the same,
+	it only eliminates code duplication.
+	* generic/tclInt.h: Eliminate use of NO_WIDE_TYPE everywhere: It's
+	exactly the same as TCL_WIDE_INT_IS_LONG
+
+2013-04-19  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclDecls.h: Implement many Tcl_*Var* functions and
+	Tcl_GetIndexFromObj as (faster/stack-saving) macros around resp
+	their Tcl_*Var*2 equivalent and Tcl_GetIndexFromObjStruct.
+
+2013-04-12  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclDecls.h: Implement Tcl_Pkg* functions as
+	(faster/stack-saving) macros around Tcl_Pkg*Ex functions.
+
+2013-04-08  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/regc_color.c:	[Bug 3610026] Stop crash when the number of
+	* generic/regerrs.h:	"colors" in a regular expression overflows
+	* generic/regex.h:	a short int.  Thanks to Heikki Linnakangas
+	* generic/regguts.h:	for the report and the patch.
+	* tests/regexp.test:
+
+2013-04-04  Reinhard Max  <max@suse.de>
+
+	* library/http/http.tcl (http::geturl): Allow URLs that don't have
+	a path, but a query query, e.g. http://example.com?foo=bar .
+	* Bump the http package to 2.8.7.
+
+2013-03-22  Venkat Iyer <venkat@comit.com>
+	* library/tzdata/Africa/Cairo: Update to tzdata2013b.
+	* library/tzdata/Africa/Casablanca:
+	* library/tzdata/Africa/Gaborone:
+	* library/tzdata/Africa/Tripoli:
+	* library/tzdata/America/Asuncion:
+	* library/tzdata/America/Barbados:
+	* library/tzdata/America/Bogota:
+	* library/tzdata/America/Costa_Rica:
+	* library/tzdata/America/Curacao:
+	* library/tzdata/America/Nassau:
+	* library/tzdata/America/Port-au-Prince:
+	* library/tzdata/America/Santiago:
+	* library/tzdata/Antarctica/Palmer:
+	* library/tzdata/Asia/Aden:
+	* library/tzdata/Asia/Hong_Kong:
+	* library/tzdata/Asia/Muscat:
+	* library/tzdata/Asia/Rangoon:
+	* library/tzdata/Asia/Shanghai:
+	* library/tzdata/Atlantic/Bermuda:
+	* library/tzdata/Europe/Vienna:
+	* library/tzdata/Pacific/Easter:
+	* library/tzdata/Pacific/Fiji:
+	* library/tzdata/Asia/Khandyga: (new)
+	* library/tzdata/Asia/Ust-Nera: (new)
+	* library/tzdata/Europe/Busingen: (new)
+
+2013-03-21  Don Porter  <dgp@users.sourceforge.net>
+
+	* library/auto.tcl: [Bug 2102614] Add ensemble indexing support
+	* tests/autoMkindex.test: to [auto_mkindex].  Thanks Brian Griffin.
+
 2013-03-19  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclFCmd.c: [Bug 3597000] Consistent [file copy] result.
@@ -8543,15 +8631,14 @@
 	implementation of the mkstemp() function, which is apparently needed
 	on some platforms.
 
-        ******************************************************************
-        *** CHANGELOG ENTRIES FOR 2008 IN "ChangeLog.2008"             ***
-        *** CHANGELOG ENTRIES FOR 2006-2007 IN "ChangeLog.2007"        ***
-        *** CHANGELOG ENTRIES FOR 2005 IN "ChangeLog.2005"             ***
-        *** CHANGELOG ENTRIES FOR 2004 IN "ChangeLog.2004"             ***
-        *** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"             ***
-        *** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"             ***
-        *** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"             ***
-        *** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"             ***
-        *** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
-        ******************************************************************
-
+	******************************************************************
+	*** CHANGELOG ENTRIES FOR 2008 IN "ChangeLog.2008"             ***
+	*** CHANGELOG ENTRIES FOR 2006-2007 IN "ChangeLog.2007"        ***
+	*** CHANGELOG ENTRIES FOR 2005 IN "ChangeLog.2005"             ***
+	*** CHANGELOG ENTRIES FOR 2004 IN "ChangeLog.2004"             ***
+	*** CHANGELOG ENTRIES FOR 2003 IN "ChangeLog.2003"             ***
+	*** CHANGELOG ENTRIES FOR 2002 IN "ChangeLog.2002"             ***
+	*** CHANGELOG ENTRIES FOR 2001 IN "ChangeLog.2001"             ***
+	*** CHANGELOG ENTRIES FOR 2000 IN "ChangeLog.2000"             ***
+	*** CHANGELOG ENTRIES FOR 1999 AND EARLIER IN "ChangeLog.1999" ***
+	******************************************************************
diff --git a/doc/NRE.3 b/doc/NRE.3
index 4ad78b3..7ebeb39 100644
--- a/doc/NRE.3
+++ b/doc/NRE.3
@@ -144,7 +144,7 @@ resolution is already known.  The \fIcmd\fR parameter gives a
 \fBTcl_Command\fR token (returned from \fBTcl_CreateObjCommand\fR or
 \fBTcl_GetCommandFromObj\fR) identifying the command to be invoked in
 the trampoline; this command must match the word in \fIobjv[0]\fR.
-The remaining arguments are as for \fBTcl_NREvalObj\fR.
+The remaining arguments are as for \fBTcl_NREvalObjv\fR.
 .PP
 \fBTcl_NREvalObj\fR, \fBTcl_NREvalObjv\fR and \fBTcl_NRCmdSwap\fR
 all accept a \fIflags\fR parameter, which is an OR-ed-together set of
diff --git a/generic/regc_color.c b/generic/regc_color.c
index b7a571c..f5d6dfd 100644
--- a/generic/regc_color.c
+++ b/generic/regc_color.c
@@ -254,7 +254,14 @@ newcolor(
 	 * Oops, must allocate more.
 	 */
 
+	if (cm->max == MAX_COLOR) {
+	    CERR(REG_ECOLORS);
+	    return COLORLESS;		/* too many colors */
+	}
 	n = cm->ncds * 2;
+	if (n < MAX_COLOR + 1) {
+	    n = MAX_COLOR + 1;
+	}
 	if (cm->cd == cm->cdspace) {
 	    newCd = (struct colordesc *) MALLOC(n * sizeof(struct colordesc));
 	    if (newCd != NULL) {
diff --git a/generic/regerrs.h b/generic/regerrs.h
index 259c0cb..72548ff 100644
--- a/generic/regerrs.h
+++ b/generic/regerrs.h
@@ -17,3 +17,4 @@
 { REG_MIXED,	"REG_MIXED",	"character widths of regex and string differ" },
 { REG_BADOPT,	"REG_BADOPT",	"invalid embedded option" },
 { REG_ETOOBIG,	"REG_ETOOBIG",	"nfa has too many states" },
+{ REG_ECOLORS,	"REG_ECOLORS",	"too many colors" },
diff --git a/generic/regex.h b/generic/regex.h
index d6d46ce..9466fbb 100644
--- a/generic/regex.h
+++ b/generic/regex.h
@@ -281,6 +281,7 @@ typedef struct {
 #define	REG_MIXED	17	/* character widths of regex and string differ */
 #define	REG_BADOPT	18	/* invalid embedded option */
 #define	REG_ETOOBIG	19	/* nfa has too many states */
+#define	REG_ECOLORS	20	/* too many colors */
 /* two specials for debugging and testing */
 #define	REG_ATOI	101	/* convert error-code name to number */
 #define	REG_ITOA	102	/* convert error-code number to name */
diff --git a/generic/regguts.h b/generic/regguts.h
index 67f9625..b4944dc 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -145,6 +145,7 @@
 
 typedef short color;		/* colors of characters */
 typedef int pcolor;		/* what color promotes to */
+#define MAX_COLOR	SHRT_MAX /* max color value */
 #define	COLORLESS	(-1)	/* impossible color */
 #define	WHITE		0	/* default color, parent of all others */
 
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 7783552..5a3347e 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5101,6 +5101,7 @@ Tcl_Eval(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_EvalObj
 int
 Tcl_EvalObj(
     Tcl_Interp *interp,
@@ -5108,6 +5109,7 @@ Tcl_EvalObj(
 {
     return Tcl_EvalObjEx(interp, objPtr, 0);
 }
+#undef Tcl_GlobalEvalObj
 int
 Tcl_GlobalEvalObj(
     Tcl_Interp *interp,
@@ -5822,6 +5824,7 @@ Tcl_ExprString(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_AddObjErrorInfo
 void
 Tcl_AppendObjToErrorInfo(
     Tcl_Interp *interp,		/* Interpreter to which error information
@@ -5886,7 +5889,6 @@ Tcl_AddErrorInfo(
  *----------------------------------------------------------------------
  */
 
-#undef Tcl_AddObjErrorInfo
 void
 Tcl_AddObjErrorInfo(
     Tcl_Interp *interp,		/* Interpreter to which error information
@@ -6556,7 +6558,7 @@ ExprAbsFunc(
 	return TCL_OK;
     }
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
     if (type == TCL_NUMBER_WIDE) {
 	Tcl_WideInt w = *((const Tcl_WideInt *) ptr);
 
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 4f22762..664c014 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -1565,7 +1565,7 @@ StringIsCmd(
 	/* TODO */
 	if ((objPtr->typePtr == &tclDoubleType) ||
 		(objPtr->typePtr == &tclIntType) ||
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		(objPtr->typePtr == &tclWideIntType) ||
 #endif
 		(objPtr->typePtr == &tclBignumType)) {
@@ -1602,7 +1602,7 @@ StringIsCmd(
 	goto failedIntParse;
     case STR_IS_ENTIER:
 	if ((objPtr->typePtr == &tclIntType) ||
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		(objPtr->typePtr == &tclWideIntType) ||
 #endif
 		(objPtr->typePtr == &tclBignumType)) {
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index ee132f4..e5defd1 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -258,8 +258,10 @@ TclCompileArraySetCmd(
 {
     Tcl_Token *varTokenPtr, *dataTokenPtr;
     int simpleVarName, isScalar, localIndex;
+    int isDataLiteral, isDataValid, isDataEven, len;
     int dataVar, iterVar, keyVar, valVar, infoIndex;
     int back, fwd, offsetBack, offsetFwd, savedStackDepth;
+    Tcl_Obj *literalObj;
     ForeachInfo *infoPtr;
 
     if (parsePtr->numWords != 3) {
@@ -269,18 +271,22 @@ TclCompileArraySetCmd(
     varTokenPtr = TokenAfter(parsePtr->tokenPtr);
     PushVarName(interp, varTokenPtr, envPtr, TCL_NO_ELEMENT,
 	    &localIndex, &simpleVarName, &isScalar);
-    dataTokenPtr = TokenAfter(varTokenPtr);
     if (!isScalar) {
 	return TCL_ERROR;
     }
+    dataTokenPtr = TokenAfter(varTokenPtr);
+    literalObj = Tcl_NewObj();
+    isDataLiteral = TclWordKnownAtCompileTime(dataTokenPtr, literalObj);
+    isDataValid = (isDataLiteral
+	    && Tcl_ListObjLength(NULL, literalObj, &len) == TCL_OK);
+    isDataEven = (isDataValid && (len & 1) == 0);
 
     /*
      * Special case: literal empty value argument is just an "ensure array"
      * operation.
      */
 
-    if (dataTokenPtr->type == TCL_TOKEN_SIMPLE_WORD
-	    && dataTokenPtr[1].size == 0) {
+    if (isDataEven && len == 0) {
 	if (localIndex >= 0) {
 	    TclEmitInstInt4(INST_ARRAY_EXISTS_IMM, localIndex,	envPtr);
 	    TclEmitInstInt1(INST_JUMP_TRUE1, 7,			envPtr);
@@ -296,7 +302,24 @@ TclCompileArraySetCmd(
 	    TclEmitOpcode(  INST_POP,				envPtr);
 	}
 	PushLiteral(envPtr, "", 0);
-	return TCL_OK;
+	goto done;
+    }
+
+    /*
+     * Special case: literal odd-length argument is always an error.
+     */
+
+    if (isDataValid && !isDataEven) {
+	savedStackDepth = envPtr->currStackDepth;
+	PushLiteral(envPtr, "list must have an even number of elements",
+		strlen("list must have an even number of elements"));
+	PushLiteral(envPtr, "-errorCode {TCL ARGUMENT FORMAT}",
+		strlen("-errorCode {TCL ARGUMENT FORMAT}"));
+	TclEmitInstInt4(INST_RETURN_IMM, 1,			envPtr);
+	TclEmitInt4(		0,				envPtr);
+	envPtr->currStackDepth = savedStackDepth;
+	PushLiteral(envPtr, "", 0);
+	goto done;
     }
 
     /*
@@ -331,7 +354,7 @@ TclCompileArraySetCmd(
 	}
 	CompileWord(envPtr, dataTokenPtr, interp);
 	TclEmitInstInt1(INST_INVOKE_STK1, 3,			envPtr);
-	return TCL_OK;
+	goto done;
     }
 
     infoPtr = ckalloc(sizeof(ForeachInfo) + sizeof(ForeachVarList *));
@@ -349,22 +372,31 @@ TclCompileArraySetCmd(
      */
 
     CompileWord(envPtr, dataTokenPtr, interp);
-    TclEmitOpcode(	INST_DUP,				envPtr);
-    TclEmitOpcode(	INST_LIST_LENGTH,			envPtr);
-    PushLiteral(envPtr, "1", 1);
-    TclEmitOpcode(	INST_BITAND,				envPtr);
-    offsetFwd = CurrentOffset(envPtr);
-    TclEmitInstInt1(	INST_JUMP_FALSE1, 0,			envPtr);
-    savedStackDepth = envPtr->currStackDepth;
-    PushLiteral(envPtr, "list must have an even number of elements",
-	    strlen("list must have an even number of elements"));
-    PushLiteral(envPtr, "-errorCode {TCL ARGUMENT FORMAT}",
-	    strlen("-errorCode {TCL ARGUMENT FORMAT}"));
-    TclEmitInstInt4(	INST_RETURN_IMM, 1,			envPtr);
-    TclEmitInt4(		0,				envPtr);
-    envPtr->currStackDepth = savedStackDepth;
-    fwd = CurrentOffset(envPtr) - offsetFwd;
-    TclStoreInt1AtPtr(fwd, envPtr->codeStart+offsetFwd+1);
+    if (!isDataLiteral || !isDataValid) {
+	/*
+	 * Only need this safety check if we're handling a non-literal or list
+	 * containing an invalid literal; with valid list literals, we've
+	 * already checked (worth it because literals are a very common
+	 * use-case with [array set]).
+	 */
+
+	TclEmitOpcode(	INST_DUP,				envPtr);
+	TclEmitOpcode(	INST_LIST_LENGTH,			envPtr);
+	PushLiteral(envPtr, "1", 1);
+	TclEmitOpcode(	INST_BITAND,				envPtr);
+	offsetFwd = CurrentOffset(envPtr);
+	TclEmitInstInt1(INST_JUMP_FALSE1, 0,			envPtr);
+	savedStackDepth = envPtr->currStackDepth;
+	PushLiteral(envPtr, "list must have an even number of elements",
+		strlen("list must have an even number of elements"));
+	PushLiteral(envPtr, "-errorCode {TCL ARGUMENT FORMAT}",
+		strlen("-errorCode {TCL ARGUMENT FORMAT}"));
+	TclEmitInstInt4(INST_RETURN_IMM, 1,			envPtr);
+	TclEmitInt4(		0,				envPtr);
+	envPtr->currStackDepth = savedStackDepth;
+	fwd = CurrentOffset(envPtr) - offsetFwd;
+	TclStoreInt1AtPtr(fwd, envPtr->codeStart+offsetFwd+1);
+    }
     Emit14Inst(		INST_STORE_SCALAR, dataVar,		envPtr);
     TclEmitOpcode(	INST_POP,				envPtr);
 
@@ -411,9 +443,13 @@ TclCompileArraySetCmd(
 	envPtr->currStackDepth = savedStackDepth;
 	TclEmitOpcode(	INST_POP,				envPtr);
     }
-    TclEmitInstInt1(	INST_UNSET_SCALAR, 0,			envPtr);
-    TclEmitInt4(		dataVar,			envPtr);
+    if (!isDataLiteral) {
+	TclEmitInstInt1(INST_UNSET_SCALAR, 0,			envPtr);
+	TclEmitInt4(		dataVar,			envPtr);
+    }
     PushLiteral(envPtr,	"", 0);
+  done:
+    Tcl_DecrRefCount(literalObj);
     return TCL_OK;
 }
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index d931873..4d40be1 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3806,16 +3806,110 @@ extern const TclStubs *tclStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
+#undef Tcl_SeekOld
+#undef Tcl_TellOld
+
+#undef Tcl_PkgPresent
+#define Tcl_PkgPresent(interp, name, version, exact) \
+	Tcl_PkgPresentEx(interp, name, version, exact, NULL)
+#undef Tcl_PkgProvide
+#define Tcl_PkgProvide(interp, name, version) \
+	Tcl_PkgProvideEx(interp, name, version, NULL)
+#undef Tcl_PkgRequire
+#define Tcl_PkgRequire(interp, name, version, exact) \
+	Tcl_PkgRequireEx(interp, name, version, exact, NULL)
+#undef Tcl_GetIndexFromObj
+#define Tcl_GetIndexFromObj(interp, objPtr, tablePtr, msg, flags, indexPtr) \
+	Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, \
+	sizeof(char *), msg, flags, indexPtr)
+#undef Tcl_NewBooleanObj
+#define Tcl_NewBooleanObj(boolValue) \
+	Tcl_NewIntObj((boolValue)!=0)
+#undef Tcl_DbNewBooleanObj
+#define Tcl_DbNewBooleanObj(boolValue, file, line) \
+	Tcl_DbNewLongObj((boolValue)!=0, file, line)
+#undef Tcl_SetBooleanObj
+#define Tcl_SetBooleanObj(objPtr, boolValue) \
+	Tcl_SetIntObj((objPtr), (boolValue)!=0)
+#undef Tcl_SetVar
+#define Tcl_SetVar(interp, varName, newValue, flags) \
+	Tcl_SetVar2(interp, varName, NULL, newValue, flags)
+#undef Tcl_UnsetVar
+#define Tcl_UnsetVar(interp, varName, flags) \
+	Tcl_UnsetVar2(interp, varName, NULL, flags)
+#undef Tcl_GetVar
+#define Tcl_GetVar(interp, varName, flags) \
+	Tcl_GetVar2(interp, varName, NULL, flags)
+#undef Tcl_TraceVar
+#define Tcl_TraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_TraceVar2(interp, varName, NULL, flags, proc, clientData)
+#undef Tcl_UntraceVar
+#define Tcl_UntraceVar(interp, varName, flags, proc, clientData) \
+	Tcl_UntraceVar2(interp, varName, NULL, flags, proc, clientData)
+#undef Tcl_VarTraceInfo
+#define Tcl_VarTraceInfo(interp, varName, flags, proc, prevClientData) \
+	Tcl_VarTraceInfo2(interp, varName, NULL, flags, proc, prevClientData)
+#undef Tcl_UpVar
+#define Tcl_UpVar(interp, frameName, varName, localName, flags) \
+	Tcl_UpVar2(interp, frameName, varName, NULL, localName, flags)
+
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+#   if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG)
+/* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore
+ * we have to make sure that all stub entries on Cygwin64 follow the
+ * Win64 signature. Cygwin64 stubbed extensions cannot use those stub
+ * entries any more, they should use the 64-bit alternatives where
+ * possible. Tcl 9 must find a better solution, but that cannot be done
+ * without introducing a binary incompatibility.
+ */
+#	undef Tcl_DbNewLongObj
+#	undef Tcl_GetLongFromObj
+#	undef Tcl_NewLongObj
+#	undef Tcl_SetLongObj
+#	undef Tcl_ExprLong
+#	undef Tcl_ExprLongObj
+#	undef Tcl_UniCharNcmp
+#	undef Tcl_UtfNcmp
+#	undef Tcl_UtfNcasecmp
+#	undef Tcl_UniCharNcasecmp
+#	define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))Tcl_DbNewWideIntObj)
+#	define Tcl_GetLongFromObj ((int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetWideIntFromObj)
+#	define Tcl_NewLongObj ((Tcl_Obj*(*)(long))Tcl_NewWideIntObj)
+#	define Tcl_SetLongObj ((void(*)(Tcl_Obj*,long))Tcl_SetWideIntObj)
+#	define Tcl_ExprLong TclExprLong
+	static inline int TclExprLong(Tcl_Interp *interp, const char *string, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLong(interp, string, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_ExprLongObj TclExprLongObj
+	static inline int TclExprLongObj(Tcl_Interp *interp, Tcl_Obj *obj, long *ptr){
+	    int intValue;
+	    int result = tclStubsPtr->tcl_ExprLongObj(interp, obj, (long *)&intValue);
+	    if (result == TCL_OK) *ptr = (long)intValue;
+	    return result;
+	}
+#	define Tcl_UniCharNcmp(ucs,uct,n) \
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcmp)(ucs,uct,(unsigned int)(n))
+#	define Tcl_UtfNcmp(s1,s2,n) \
+		((int(*)(const char*,const char*,unsigned int))tclStubsPtr->tcl_UtfNcmp)(s1,s2,(unsigned int)(n))
+#	define Tcl_UtfNcasecmp(s1,s2,n) \
+		((int(*)(const char*,const char*,unsigned int))tclStubsPtr->tcl_UtfNcasecmp)(s1,s2,(unsigned int)(n))
+#	define Tcl_UniCharNcasecmp(ucs,uct,n) \
+		((int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned int))tclStubsPtr->tcl_UniCharNcasecmp)(ucs,uct,(unsigned int)(n))
+#   endif
+#endif
+
 /*
  * Deprecated Tcl procedures:
  */
-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-#   undef Tcl_EvalObj
-#   define Tcl_EvalObj(interp,objPtr) \
-	Tcl_EvalObjEx((interp),(objPtr),0)
-#   undef Tcl_GlobalEvalObj
-#   define Tcl_GlobalEvalObj(interp,objPtr) \
-	Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
-#endif
+
+#undef Tcl_EvalObj
+#define Tcl_EvalObj(interp,objPtr) \
+    Tcl_EvalObjEx((interp),(objPtr),0)
+#undef Tcl_GlobalEvalObj
+#define Tcl_GlobalEvalObj(interp,objPtr) \
+    Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
 
 #endif /* _TCLDECLS */
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 232d377..32cbf6a 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -434,7 +434,7 @@ VarHashCreateVar(
  *			ClientData *ptrPtr, int *tPtr);
  */
 
-#ifdef NO_WIDE_TYPE
+#ifdef TCL_WIDE_INT_IS_LONG
 #define GetNumberFromObj(interp, objPtr, ptrPtr, tPtr) \
     (((objPtr)->typePtr == &tclIntType)					\
 	?	(*(tPtr) = TCL_NUMBER_LONG,				\
@@ -450,7 +450,7 @@ VarHashCreateVar(
     (((objPtr)->bytes != NULL) && ((objPtr)->length == 0)))		\
 	? TCL_ERROR :							\
     TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr)))
-#else /* !NO_WIDE_TYPE */
+#else /* !TCL_WIDE_INT_IS_LONG */
 #define GetNumberFromObj(interp, objPtr, ptrPtr, tPtr) \
     (((objPtr)->typePtr == &tclIntType)					\
 	?	(*(tPtr) = TCL_NUMBER_LONG,				\
@@ -470,7 +470,7 @@ VarHashCreateVar(
     (((objPtr)->bytes != NULL) && ((objPtr)->length == 0)))		\
 	? TCL_ERROR :							\
     TclGetNumberFromObj((interp), (objPtr), (ptrPtr), (tPtr)))
-#endif /* NO_WIDE_TYPE */
+#endif /* TCL_WIDE_INT_IS_LONG */
 
 /*
  * Macro used in this file to save a function call for common uses of
@@ -494,13 +494,13 @@ VarHashCreateVar(
  *			Tcl_WideInt *wideIntPtr);
  */
 
-#ifdef NO_WIDE_TYPE
+#ifdef TCL_WIDE_INT_IS_LONG
 #define TclGetWideIntFromObj(interp, objPtr, wideIntPtr) \
     (((objPtr)->typePtr == &tclIntType)					\
 	? (*(wideIntPtr) = (Tcl_WideInt)				\
 		((objPtr)->internalRep.longValue), TCL_OK) :		\
 	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
-#else /* !NO_WIDE_TYPE */
+#else /* !TCL_WIDE_INT_IS_LONG */
 #define TclGetWideIntFromObj(interp, objPtr, wideIntPtr)		\
     (((objPtr)->typePtr == &tclWideIntType)				\
 	? (*(wideIntPtr) = (objPtr)->internalRep.wideValue, TCL_OK) :	\
@@ -508,7 +508,7 @@ VarHashCreateVar(
 	? (*(wideIntPtr) = (Tcl_WideInt)				\
 		((objPtr)->internalRep.longValue), TCL_OK) :		\
 	Tcl_GetWideIntFromObj((interp), (objPtr), (wideIntPtr)))
-#endif /* NO_WIDE_TYPE */
+#endif /* TCL_WIDE_INT_IS_LONG */
 
 /*
  * Macro used to make the check for type overflow more mnemonic. This works by
@@ -1795,7 +1795,7 @@ TclIncrObj(
 	    TclSetLongObj(valuePtr, sum);
 	    return TCL_OK;
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	{
 	    Tcl_WideInt w1 = (Tcl_WideInt) augend;
 	    Tcl_WideInt w2 = (Tcl_WideInt) addend;
@@ -1828,7 +1828,7 @@ TclIncrObj(
 	return TCL_ERROR;
     }
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
     if ((type1 != TCL_NUMBER_BIG) && (type2 != TCL_NUMBER_BIG)) {
 	Tcl_WideInt w1, w2, sum;
 
@@ -3292,7 +3292,7 @@ TEBCresume(
 
     {
 	Tcl_Obj *incrPtr;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	Tcl_WideInt w;
 #endif
 	long increment;
@@ -3414,7 +3414,7 @@ TEBCresume(
 			}
 			goto doneIncr;
 		    }
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		    w = (Tcl_WideInt)augend;
 
 		    TRACE(("%u %ld => ", opnd, increment));
@@ -3436,7 +3436,7 @@ TEBCresume(
 		    goto doneIncr;
 #endif
 		}	/* end if (type == TCL_NUMBER_LONG) */
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		if (type == TCL_NUMBER_WIDE) {
 		    Tcl_WideInt sum;
 
@@ -5512,7 +5512,7 @@ TEBCresume(
 		w1 = (Tcl_WideInt) l1;
 		w2 = (Tcl_WideInt) l2;
 		wResult = w1 + w2;
-#ifdef NO_WIDE_TYPE
+#ifdef TCL_WIDE_INT_IS_LONG
 		/*
 		 * Check for overflow.
 		 */
@@ -5527,7 +5527,7 @@ TEBCresume(
 		w1 = (Tcl_WideInt) l1;
 		w2 = (Tcl_WideInt) l2;
 		wResult = w1 - w2;
-#ifdef NO_WIDE_TYPE
+#ifdef TCL_WIDE_INT_IS_LONG
 		/*
 		 * Must check for overflow. The macro tests for overflows in
 		 * sums by looking at the sign bits. As we have a subtraction
@@ -7070,7 +7070,7 @@ ExecuteExtendedBinaryMathOp(
 		return constants[0];
 	    }
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (type1 == TCL_NUMBER_WIDE) {
 	    w1 = *((const Tcl_WideInt *)ptr1);
 	    if (type2 != TCL_NUMBER_BIG) {
@@ -7145,7 +7145,7 @@ ExecuteExtendedBinaryMathOp(
 	case TCL_NUMBER_LONG:
 	    invalid = (*((const long *)ptr2) < 0L);
 	    break;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	case TCL_NUMBER_WIDE:
 	    invalid = (*((const Tcl_WideInt *)ptr2) < (Tcl_WideInt)0);
 	    break;
@@ -7229,7 +7229,7 @@ ExecuteExtendedBinaryMathOp(
 		case TCL_NUMBER_LONG:
 		    zero = (*(const long *)ptr1 > 0L);
 		    break;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		case TCL_NUMBER_WIDE:
 		    zero = (*(const Tcl_WideInt *)ptr1 > (Tcl_WideInt)0);
 		    break;
@@ -7250,7 +7250,7 @@ ExecuteExtendedBinaryMathOp(
 	    }
 	    shift = (int)(*(const long *)ptr2);
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	    /*
 	     * Handle shifts within the native wide range.
 	     */
@@ -7433,7 +7433,7 @@ ExecuteExtendedBinaryMathOp(
 	    BIG_RESULT(&bigResult);
 	}
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if ((type1 == TCL_NUMBER_WIDE) || (type2 == TCL_NUMBER_WIDE)) {
 	    TclGetWideIntFromObj(NULL, valuePtr, &w1);
 	    TclGetWideIntFromObj(NULL, value2Ptr, &w2);
@@ -7511,7 +7511,7 @@ ExecuteExtendedBinaryMathOp(
 	    negativeExponent = (l2 < 0);
 	    oddExponent = (int) (l2 & 1);
 	    break;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	case TCL_NUMBER_WIDE:
 	    w2 = *((const Tcl_WideInt *)ptr2);
 	    negativeExponent = (w2 < 0);
@@ -7703,7 +7703,7 @@ ExecuteExtendedBinaryMathOp(
 #if (LONG_MAX > 0x7fffffff) || !defined(TCL_WIDE_INT_IS_LONG)
 	if (type1 == TCL_NUMBER_LONG) {
 	    w1 = l1;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	} else if (type1 == TCL_NUMBER_WIDE) {
 	    w1 = *((const Tcl_WideInt *) ptr1);
 #endif
@@ -7906,7 +7906,7 @@ ExecuteExtendedBinaryMathOp(
 	    switch (opcode) {
 	    case INST_ADD:
 		wResult = w1 + w2;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		if ((type1 == TCL_NUMBER_WIDE) || (type2 == TCL_NUMBER_WIDE))
 #endif
 		{
@@ -7922,7 +7922,7 @@ ExecuteExtendedBinaryMathOp(
 
 	    case INST_SUB:
 		wResult = w1 - w2;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		if ((type1 == TCL_NUMBER_WIDE) || (type2 == TCL_NUMBER_WIDE))
 #endif
 		{
@@ -8048,7 +8048,7 @@ ExecuteExtendedUnaryMathOp(
 
     switch (opcode) {
     case INST_BITNOT:
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (type == TCL_NUMBER_WIDE) {
 	    w = *((const Tcl_WideInt *) ptr);
 	    WIDE_RESULT(~w);
@@ -8070,7 +8070,7 @@ ExecuteExtendedUnaryMathOp(
 	    }
 	    TclBNInitBignumFromLong(&big, *(const long *) ptr);
 	    break;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	case TCL_NUMBER_WIDE:
 	    w = *((const Tcl_WideInt *) ptr);
 	    if (w != LLONG_MIN) {
@@ -8122,7 +8122,7 @@ TclCompareTwoNumbers(
     mp_int big1, big2;
     double d1, d2, tmp;
     long l1, l2;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
     Tcl_WideInt w1, w2;
 #endif
 
@@ -8137,7 +8137,7 @@ TclCompareTwoNumbers(
 	    l2 = *((const long *)ptr2);
 	longCompare:
 	    return (l1 < l2) ? MP_LT : ((l1 > l2) ? MP_GT : MP_EQ);
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	case TCL_NUMBER_WIDE:
 	    w2 = *((const Tcl_WideInt *)ptr2);
 	    w1 = (Tcl_WideInt)l1;
@@ -8189,7 +8189,7 @@ TclCompareTwoNumbers(
 	    return compare;
 	}
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
     case TCL_NUMBER_WIDE:
 	w1 = *((const Tcl_WideInt *)ptr1);
 	switch (type2) {
@@ -8250,7 +8250,7 @@ TclCompareTwoNumbers(
 	    }
 	    l1 = (long) d1;
 	    goto longCompare;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	case TCL_NUMBER_WIDE:
 	    w2 = *((const Tcl_WideInt *)ptr2);
 	    d2 = (double) w2;
@@ -8294,7 +8294,7 @@ TclCompareTwoNumbers(
     case TCL_NUMBER_BIG:
 	Tcl_TakeBignumFromObj(NULL, valuePtr, &big1);
 	switch (type2) {
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	case TCL_NUMBER_WIDE:
 #endif
 	case TCL_NUMBER_LONG:
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 32bfe05..dacb38d 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -23,7 +23,6 @@
  * Some numerics configuration options.
  */
 
-#undef NO_WIDE_TYPE
 #undef ACCEPT_NAN
 
 /*
@@ -96,14 +95,6 @@ typedef int ptrdiff_t;
 #endif
 
 /*
- * When Tcl_WideInt and long are the same type, there's no value in
- * having a tclWideIntType separate from the tclIntType.
- */
-#ifdef TCL_WIDE_INT_IS_LONG
-#define NO_WIDE_TYPE
-#endif
-
-/*
  * Macros used to cast between pointers and integers (e.g. when storing an int
  * in ClientData), on 64-bit architectures they avoid gcc warning about "cast
  * to/from pointer from/to integer of different size".
@@ -2425,7 +2416,7 @@ MODULE_SCOPE const Tcl_ObjType tclProcBodyType;
 MODULE_SCOPE const Tcl_ObjType tclStringType;
 MODULE_SCOPE const Tcl_ObjType tclArraySearchType;
 MODULE_SCOPE const Tcl_ObjType tclEnsembleCmdType;
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 MODULE_SCOPE const Tcl_ObjType tclWideIntType;
 #endif
 MODULE_SCOPE const Tcl_ObjType tclRegexpType;
@@ -4128,7 +4119,7 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
  *----------------------------------------------------------------
  */
 
-#define TclSetIntObj(objPtr, i) \
+#define TclSetLongObj(objPtr, i) \
     do {						\
 	TclInvalidateStringRep(objPtr);			\
 	TclFreeIntRep(objPtr);				\
@@ -4136,8 +4127,8 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
 	(objPtr)->typePtr = &tclIntType;		\
     } while (0)
 
-#define TclSetLongObj(objPtr, l) \
-    TclSetIntObj((objPtr), (l))
+#define TclSetIntObj(objPtr, l) \
+    TclSetLongObj(objPtr, l)
 
 /*
  * NOTE: There is to be no such thing as a "pure" boolean. Boolean values set
@@ -4147,9 +4138,9 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
  */
 
 #define TclSetBooleanObj(objPtr, b) \
-    TclSetIntObj((objPtr), ((b)? 1 : 0));
+    TclSetLongObj(objPtr, (b)!=0);
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 #define TclSetWideIntObj(objPtr, w) \
     do {							\
 	TclInvalidateStringRep(objPtr);				\
@@ -4185,7 +4176,7 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
  */
 
 #ifndef TCL_MEM_DEBUG
-#define TclNewIntObj(objPtr, i) \
+#define TclNewLongObj(objPtr, i) \
     do {						\
 	TclIncrObjsAllocated();				\
 	TclAllocObjStorage(objPtr);			\
@@ -4196,15 +4187,15 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
 	TCL_DTRACE_OBJ_CREATE(objPtr);			\
     } while (0)
 
-#define TclNewLongObj(objPtr, l) \
-    TclNewIntObj((objPtr), (l))
+#define TclNewIntObj(objPtr, l) \
+    TclNewLongObj(objPtr, l)
 
 /*
  * NOTE: There is to be no such thing as a "pure" boolean.
  * See comment above TclSetBooleanObj macro above.
  */
 #define TclNewBooleanObj(objPtr, b) \
-    TclNewIntObj((objPtr), ((b)? 1 : 0))
+    TclNewLongObj((objPtr), (b)!=0)
 
 #define TclNewDoubleObj(objPtr, d) \
     do {							\
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 89dc435..39ff402 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -1351,4 +1351,7 @@ extern const TclIntStubs *tclIntStubsPtr;
 	   (tclStubsPtr->tcl_GetCommandFullName) /* 517 */
 #endif
 
+#undef TclCopyChannelOld
+#undef TclSockMinimumBuffersOld
+
 #endif /* _TCLINTDECLS */
diff --git a/generic/tclObj.c b/generic/tclObj.c
index ba1ef29..7b27fab 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -197,7 +197,7 @@ static int		SetDoubleFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static int		SetIntFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UpdateStringOfDouble(Tcl_Obj *objPtr);
 static void		UpdateStringOfInt(Tcl_Obj *objPtr);
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 static void		UpdateStringOfWideInt(Tcl_Obj *objPtr);
 static int		SetWideIntFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 #endif
@@ -257,7 +257,7 @@ const Tcl_ObjType tclIntType = {
     UpdateStringOfInt,		/* updateStringProc */
     SetIntFromAny		/* setFromAnyProc */
 };
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 const Tcl_ObjType tclWideIntType = {
     "wideInt",			/* name */
     NULL,			/* freeIntRepProc */
@@ -395,7 +395,7 @@ TclInitObjSubsystem(void)
 
     /* For backward compatibility only ... */
     Tcl_RegisterObjType(&oldBooleanType);
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
     Tcl_RegisterObjType(&tclWideIntType);
 #endif
 
@@ -1521,7 +1521,7 @@ Tcl_GetBooleanFromObj(
 	    *boolPtr = 1;
 	    return TCL_OK;
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    *boolPtr = (objPtr->internalRep.wideValue != 0);
 	    return TCL_OK;
@@ -1576,7 +1576,7 @@ TclSetBooleanFromAny(
 	    goto badBoolean;
 	}
 
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    goto badBoolean;
 	}
@@ -1908,7 +1908,7 @@ Tcl_GetDoubleFromObj(
 	    *dblPtr = TclBignumToDouble(&big);
 	    return TCL_OK;
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    *dblPtr = (double) objPtr->internalRep.wideValue;
 	    return TCL_OK;
@@ -2366,7 +2366,7 @@ Tcl_GetLongFromObj(
 	    *longPtr = objPtr->internalRep.longValue;
 	    return TCL_OK;
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    /*
 	     * We return any integer in the range -ULONG_MAX to ULONG_MAX
@@ -2424,7 +2424,7 @@ Tcl_GetLongFromObj(
 		    return TCL_OK;
 		}
 	    }
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	tooLarge:
 #endif
 	    if (interp != NULL) {
@@ -2440,7 +2440,7 @@ Tcl_GetLongFromObj(
 	    TCL_PARSE_INTEGER_ONLY)==TCL_OK);
     return TCL_ERROR;
 }
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 
 /*
  *----------------------------------------------------------------------
@@ -2482,7 +2482,7 @@ UpdateStringOfWideInt(
     memcpy(objPtr->bytes, buffer, len + 1);
     objPtr->length = len;
 }
-#endif /* !NO_WIDE_TYPE */
+#endif /* !TCL_WIDE_INT_IS_LONG */
 
 /*
  *----------------------------------------------------------------------
@@ -2637,7 +2637,7 @@ Tcl_SetWideIntObj(
 	    && (wideValue <= (Tcl_WideInt) LONG_MAX)) {
 	TclSetLongObj(objPtr, (long) wideValue);
     } else {
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	TclSetWideIntObj(objPtr, wideValue);
 #else
 	mp_int big;
@@ -2677,7 +2677,7 @@ Tcl_GetWideIntFromObj(
 				/* Place to store resulting long. */
 {
     do {
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    *wideIntPtr = objPtr->internalRep.wideValue;
 	    return TCL_OK;
@@ -2737,7 +2737,7 @@ Tcl_GetWideIntFromObj(
 	    TCL_PARSE_INTEGER_ONLY)==TCL_OK);
     return TCL_ERROR;
 }
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 
 /*
  *----------------------------------------------------------------------
@@ -2763,7 +2763,7 @@ SetWideIntFromAny(
     Tcl_WideInt w;
     return Tcl_GetWideIntFromObj(interp, objPtr, &w);
 }
-#endif /* !NO_WIDE_TYPE */
+#endif /* !TCL_WIDE_INT_IS_LONG */
 
 /*
  *----------------------------------------------------------------------
@@ -3011,7 +3011,7 @@ GetBignumFromObj(
 	    TclBNInitBignumFromLong(bignumValue, objPtr->internalRep.longValue);
 	    return TCL_OK;
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    TclBNInitBignumFromWideInt(bignumValue,
 		    objPtr->internalRep.wideValue);
@@ -3150,7 +3150,7 @@ Tcl_SetBignumObj(
 	return;
     }
   tooLargeForLong:
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
     if ((size_t) bignumValue->used
 	    <= (CHAR_BIT * sizeof(Tcl_WideInt) + DIGIT_BIT - 1) / DIGIT_BIT) {
 	Tcl_WideUInt value = 0;
@@ -3262,7 +3262,7 @@ TclGetNumberFromObj(
 	    *clientDataPtr = &objPtr->internalRep.longValue;
 	    return TCL_OK;
 	}
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	if (objPtr->typePtr == &tclWideIntType) {
 	    *typePtr = TCL_NUMBER_WIDE;
 	    *clientDataPtr = &objPtr->internalRep.wideValue;
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 07f62a4..df90cea 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -949,7 +949,7 @@ Tcl_PackageObjCmd(
 		version = TclGetString(objv[3]);
 	    }
 	}
-	Tcl_PkgPresent(interp, name, version, exact);
+	Tcl_PkgPresentEx(interp, name, version, exact, NULL);
 	return TCL_ERROR;
 	break;
     }
@@ -974,7 +974,7 @@ Tcl_PackageObjCmd(
 	if (CheckVersionAndConvert(interp, argv3, NULL, NULL) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	return Tcl_PkgProvide(interp, argv2, argv3);
+	return Tcl_PkgProvideEx(interp, argv2, argv3, NULL);
     case PKG_REQUIRE:
     require:
 	if (objc < 3) {
diff --git a/generic/tclProc.c b/generic/tclProc.c
index 6081a66..0c2044c 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -731,7 +731,7 @@ TclObjGetFrame(
 	}
 	/* TODO: Consider skipping the typePtr checks */
     } else if (objPtr->typePtr == &tclIntType
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	    || objPtr->typePtr == &tclWideIntType
 #endif
 	    ) {
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 2d534a68..883e2ea 100755
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -1239,7 +1239,7 @@ TclParseNumber(
 	    if (!octalSignificandOverflow) {
 		if (octalSignificandWide >
 			(Tcl_WideUInt)(((~(unsigned long)0) >> 1) + signum)) {
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		    if (octalSignificandWide <= (MOST_BITS + signum)) {
 			objPtr->typePtr = &tclWideIntType;
 			if (signum) {
@@ -1286,7 +1286,7 @@ TclParseNumber(
 	    if (!significandOverflow) {
 		if (significandWide >
 			(Tcl_WideUInt)(((~(unsigned long)0) >> 1) + signum)) {
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 		    if (significandWide <= MOST_BITS+signum) {
 			objPtr->typePtr = &tclWideIntType;
 			if (signum) {
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 78d4dd1..11e03f9 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -197,6 +197,91 @@ Tcl_WinTCharToUtf(
 	    string, len, dsPtr);
 }
 
+#if defined(TCL_WIDE_INT_IS_LONG)
+/* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore
+ * we have to make sure that all stub entries on Cygwin64 follow the Win64
+ * signature. Tcl 9 must find a better solution, but that cannot be done
+ * without introducing a binary incompatibility.
+ */
+#define Tcl_DbNewLongObj ((Tcl_Obj*(*)(long,const char*,int))dbNewLongObj)
+static Tcl_Obj *dbNewLongObj(
+    int intValue,
+    const char *file,
+    int line
+) {
+#ifdef TCL_MEM_DEBUG
+    register Tcl_Obj *objPtr;
+
+    TclDbNewObj(objPtr, file, line);
+    objPtr->bytes = NULL;
+
+    objPtr->internalRep.longValue = (long) intValue;
+    objPtr->typePtr = &tclIntType;
+    return objPtr;
+#else
+    return Tcl_NewIntObj(intValue);
+#endif
+}
+#define Tcl_GetLongFromObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))Tcl_GetIntFromObj
+#define Tcl_NewLongObj (Tcl_Obj*(*)(long))Tcl_NewIntObj
+#define Tcl_SetLongObj (void(*)(Tcl_Obj*,long))Tcl_SetIntObj
+static int exprInt(Tcl_Interp *interp, const char *expr, int *ptr){
+    long longValue;
+    int result = Tcl_ExprLong(interp, expr, &longValue);
+    if (result == TCL_OK) {
+	    if ((longValue >= -(long)(UINT_MAX))
+		    && (longValue <= (long)(UINT_MAX))) {
+	    *ptr = (int)longValue;
+	} else {
+	    Tcl_SetResult(interp,
+		    "integer value too large to represent as non-long integer",
+		    TCL_STATIC);
+	    result = TCL_ERROR;
+	}
+    }
+    return result;
+}
+#define Tcl_ExprLong (int(*)(Tcl_Interp*,const char*,long*))exprInt
+static int exprIntObj(Tcl_Interp *interp, Tcl_Obj*expr, int *ptr){
+    long longValue;
+    int result = Tcl_ExprLongObj(interp, expr, &longValue);
+    if (result == TCL_OK) {
+	    if ((longValue >= -(long)(UINT_MAX))
+		    && (longValue <= (long)(UINT_MAX))) {
+	    *ptr = (int)longValue;
+	} else {
+	    Tcl_SetResult(interp,
+		    "integer value too large to represent as non-long integer",
+		    TCL_STATIC);
+	    result = TCL_ERROR;
+	}
+    }
+    return result;
+}
+#define Tcl_ExprLongObj (int(*)(Tcl_Interp*,Tcl_Obj*,long*))exprIntObj
+static int uniCharNcmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsigned int n){
+   return Tcl_UniCharNcmp(ucs, uct, (unsigned long)n);
+}
+#define Tcl_UniCharNcmp (int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned long))uniCharNcmp
+static int utfNcmp(const char *s1, const char *s2, unsigned int n){
+   return Tcl_UtfNcmp(s1, s2, (unsigned long)n);
+}
+#define Tcl_UtfNcmp (int(*)(const char*,const char*,unsigned long))utfNcmp
+static int utfNcasecmp(const char *s1, const char *s2, unsigned int n){
+   return Tcl_UtfNcasecmp(s1, s2, (unsigned long)n);
+}
+#define Tcl_UtfNcasecmp (int(*)(const char*,const char*,unsigned long))utfNcasecmp
+static int uniCharNcasecmp(const Tcl_UniChar *ucs, const Tcl_UniChar *uct, unsigned int n){
+   return Tcl_UniCharNcasecmp(ucs, uct, (unsigned long)n);
+}
+#define Tcl_UniCharNcasecmp (int(*)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned long))uniCharNcasecmp
+static int formatInt(char *buffer, int n){
+   return TclFormatInt(buffer, (long)n);
+}
+#define TclFormatInt (int(*)(char *, long))formatInt
+
+#endif
+
 #else /* UNIX and MAC */
 #   define TclpLocaltime_unix TclpLocaltime
 #   define TclpGmtime_unix TclpGmtime
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 7af5c2b..4e6d065 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -327,10 +327,12 @@ static int		TestreturnObjCmd(ClientData dummy,
 			    Tcl_Obj *const objv[]);
 static void		TestregexpXflags(const char *string,
 			    int length, int *cflagsPtr, int *eflagsPtr);
+#ifndef TCL_NO_DEPRECATED
 static int		TestsaveresultCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 static void		TestsaveresultFree(char *blockPtr);
+#endif /* TCL_NO_DEPRECATED */
 static int		TestsetassocdataCmd(ClientData dummy,
 			    Tcl_Interp *interp, int argc, const char **argv);
 static int		TestsetCmd(ClientData dummy,
@@ -523,7 +525,9 @@ int
 Tcltest_Init(
     Tcl_Interp *interp)		/* Interpreter for application. */
 {
+#ifndef TCL_NO_DEPRECATED
     Tcl_ValueType t3ArgTypes[2];
+#endif /* TCL_NO_DEPRECATED */
 
     Tcl_Obj *listPtr;
     Tcl_Obj **objv;
@@ -642,8 +646,10 @@ Tcltest_Init(
 	    NULL, NULL);
     Tcl_CreateObjCommand(interp, "testreturn", TestreturnObjCmd,
 	    NULL, NULL);
+#ifndef TCL_NO_DEPRECATED
     Tcl_CreateObjCommand(interp, "testsaveresult", TestsaveresultCmd,
 	    NULL, NULL);
+#endif /* TCL_NO_DEPRECATED */
     Tcl_CreateCommand(interp, "testsetassocdata", TestsetassocdataCmd,
 	    NULL, NULL);
     Tcl_CreateCommand(interp, "testsetnoerr", TestsetCmd,
@@ -665,8 +671,10 @@ Tcltest_Init(
     Tcl_CreateCommand(interp, "testtranslatefilename",
 	    TesttranslatefilenameCmd, NULL, NULL);
     Tcl_CreateCommand(interp, "testupvar", TestupvarCmd, NULL, NULL);
+#ifndef TCL_NO_DEPRECATED
     Tcl_CreateMathFunc(interp, "T1", 0, NULL, TestMathFunc, (ClientData) 123);
     Tcl_CreateMathFunc(interp, "T2", 0, NULL, TestMathFunc, (ClientData) 345);
+#endif /* TCL_NO_DEPRECATED */
     Tcl_CreateCommand(interp, "testmainthread", TestmainthreadCmd, NULL,
 	    NULL);
     Tcl_CreateCommand(interp, "testsetmainloop", TestsetmainloopCmd,
@@ -677,10 +685,12 @@ Tcltest_Init(
     Tcl_CreateObjCommand(interp, "testcpuid", TestcpuidCmd,
 	    (ClientData) 0, NULL);
 #endif
+#ifndef TCL_NO_DEPRECATED
     t3ArgTypes[0] = TCL_EITHER;
     t3ArgTypes[1] = TCL_EITHER;
     Tcl_CreateMathFunc(interp, "T3", 2, t3ArgTypes, TestMathFunc2,
 	    NULL);
+#endif /* TCL_NO_DEPRECATED */
 
     Tcl_CreateObjCommand(interp, "testnrelevels", TestNRELevels,
 	    NULL, NULL);
@@ -5003,6 +5013,7 @@ Testset2Cmd(
     }
 }
 
+#ifndef TCL_NO_DEPRECATED
 /*
  *----------------------------------------------------------------------
  *
@@ -5136,6 +5147,7 @@ TestsaveresultFree(
 {
     freeCount++;
 }
+#endif /* TCL_NO_DEPRECATED */
 
 /*
  *----------------------------------------------------------------------
@@ -6170,7 +6182,7 @@ TestReport(
 	 * API, but there you go. We should convert it to objects.
 	 */
 
-	Tcl_SavedResult savedResult;
+	Tcl_Obj *savedResult;
 	Tcl_DString ds;
 
 	Tcl_DStringInit(&ds);
@@ -6184,11 +6196,15 @@ TestReport(
 	    Tcl_DStringAppendElement(&ds, Tcl_GetString(arg2));
 	}
 	Tcl_DStringEndSublist(&ds);
-	Tcl_SaveResult(interp, &savedResult);
+	savedResult = Tcl_GetObjResult(interp);
+	Tcl_IncrRefCount(savedResult);
+	Tcl_SetObjResult(interp, Tcl_NewObj());
 	Tcl_Eval(interp, Tcl_DStringValue(&ds));
 	Tcl_DStringFree(&ds);
-	Tcl_RestoreResult(interp, &savedResult);
-   }
+	Tcl_ResetResult(interp);
+	Tcl_SetObjResult(interp, savedResult);
+	Tcl_DecrRefCount(savedResult);
+    }
 }
 
 static int
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 6b17825..c10986a 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -819,7 +819,7 @@ Tcl_AfterObjCmd(
      */
 
     if (objv[1]->typePtr == &tclIntType
-#ifndef NO_WIDE_TYPE
+#ifndef TCL_WIDE_INT_IS_LONG
 	    || objv[1]->typePtr == &tclWideIntType
 #endif
 	    || objv[1]->typePtr == &tclBignumType
diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index ff887c8..9bceb4c 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -3891,8 +3891,10 @@ Tcl_ZlibStreamInit(
     Tcl_Obj *dictObj,
     Tcl_ZlibStream *zshandle)
 {
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
-    Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
+    if (interp) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
+	Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
+    }
     return TCL_ERROR;
 }
 
@@ -3957,8 +3959,10 @@ Tcl_ZlibDeflate(
     int level,
     Tcl_Obj *gzipHeaderDictObj)
 {
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
-    Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
+    if (interp) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
+	Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
+    }
     return TCL_ERROR;
 }
 
@@ -3970,8 +3974,10 @@ Tcl_ZlibInflate(
     int bufferSize,
     Tcl_Obj *gzipHeaderDictObj)
 {
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
-    Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
+    if (interp) {
+	Tcl_SetObjResult(interp, Tcl_NewStringObj("unimplemented", -1));
+	Tcl_SetErrorCode(interp, "TCL", "UNIMPLEMENTED", NULL);
+    }
     return TCL_ERROR;
 }
 
diff --git a/library/auto.tcl b/library/auto.tcl
index e86257e..0848bb1 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -605,6 +605,15 @@ 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 {} {}]
+	    }
+	}
     }
 }
 
diff --git a/library/http/http.tcl b/library/http/http.tcl
index ddf066e..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.6
+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)
 	    ^
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index a8641e1..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.6 [list tclPkgSetup $dir http 2.8.6 {{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/platform/platform.tcl b/library/platform/platform.tcl
index a1a728b..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 {version ([0-9]+(\.[0-9]+)*), by} $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.11
+package provide platform 1.0.12
 
 # ### ### ### ######### ######### #########
 ## Demo application
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..74b767a 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}
+    {1373335200 0 0 WET}
+    {1375927200 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..d530193 100644
--- a/library/tzdata/America/Asuncion
+++ b/library/tzdata/America/Asuncion
@@ -82,7 +82,8 @@ set TZData(:America/Asuncion) {
     {1317528000 -10800 1 PYST}
     {1333854000 -14400 0 PYT}
     {1349582400 -10800 1 PYST}
-    {1365908400 -14400 0 PYT}
+    {1364094000 -14400 0 PYT}
+    {1365912000 -14400 0 PYT}
     {1381032000 -10800 1 PYST}
     {1397358000 -14400 0 PYT}
     {1412481600 -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/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/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/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/tests/autoMkindex.test b/tests/autoMkindex.test
index 8f29131..4721553 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -236,6 +236,38 @@ test autoMkindex-3.3 {auto_mkindex_parser::command} -setup {
     # Reset initCommands to avoid trashing other tests
     AutoMkindexTestReset
 } -result "{::buried::mycmd4 $element} {::buried::mycmd5 $element} {mycmd6 $element}"
+makeFile {
+
+namespace eval wok {
+    namespace ensemble create -subcommands {commands vars}
+
+    proc commands {{pattern *}} {
+	puts [join [lsort -dictionary [info commands $pattern]] \n]
+    }
+
+    proc vars {{pattern *}} {
+	puts [join [lsort -dictionary [info vars $pattern]] \n]
+    }
+
+}
+
+} ensemblecommands.tcl
+
+test autoMkindex-3.4 {ensemble commands in tclIndex} {
+    file delete tclIndex
+    auto_mkindex . ensemblecommands.tcl
+    set f [open tclIndex r]
+    set dat [list]
+    foreach r [split [string trim [read $f]] "\n"] {
+	if {[string match {set auto_index*} $r]} {
+	    lappend dat $r
+	}
+    }
+    set result [lsort $dat]
+    close $f
+    set result
+} {{set auto_index(::wok::commands) [list source [file join $dir ensemblecommands.tcl]]} {set auto_index(::wok::vars) [list source [file join $dir ensemblecommands.tcl]]} {set auto_index(wok) [list source [file join $dir ensemblecommands.tcl]]}}
+removeFile ensemblecommands.tcl
 
 test autoMkindex-4.1 {platform independent source commands} -setup {
     file delete tclIndex
diff --git a/tests/http.test b/tests/http.test
index e2de7d8..7d439b1 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -135,6 +135,7 @@ set fullurl http://user:pass@[info hostname]:$port/a/b/c
 set binurl //[info hostname]:$port/binary
 set posturl //[info hostname]:$port/post
 set badposturl //[info hostname]:$port/droppost
+set authorityurl //[info hostname]:$port
 set ipv6url http://\[::1\]:$port/
 test http-3.4 {http::geturl} -body {
     set token [http::geturl $url]
@@ -391,7 +392,7 @@ Connection close
 Content-Type {text/plain;charset=utf-8}
 Accept-Encoding .*
 Content-Length 5}
-test http-3.29 "http::geturl $ipv6url" -body {
+test http-3.29 {http::geturl IPv6 address} -body {
     # We only want to see if the URL gets parsed correctly. This is
     # the case if http::geturl succeeds or returns a socket related
     # error. If the parsing is wrong, we'll get a parse error.
@@ -405,7 +406,18 @@ test http-3.29 "http::geturl $ipv6url" -body {
 } -cleanup {
     catch { http::cleanup $token }
 } -result 0
-
+test http-3.30 {http::geturl query without path} -body {
+    set token [http::geturl $authorityurl?var=val]
+    http::ncode $token
+} -cleanup {
+    catch { http::cleanup $token }
+} -result 200
+test http-3.31 {http::geturl fragment without path} -body {
+    set token [http::geturl "$authorityurl#fragment42"]
+    http::ncode $token
+} -cleanup {
+    catch { http::cleanup $token }
+} -result 200
 test http-4.1 {http::Event} -body {
     set token [http::geturl $url -keepalive 0]
     upvar #0 $token data
diff --git a/tests/regexp.test b/tests/regexp.test
index 2d2814a..1c30001 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -865,6 +865,17 @@ test regexp-22.4 {Bug 3606139} -setup {
 } -cleanup {
     rename a {}
 } -returnCodes 1 -result {couldn't compile regular expression pattern: nfa has too many states}
+test regexp-22.5 {Bug 3610026} -setup {
+    set e {}
+    set cp 99
+    while {$cp < 32864} {
+	append e [format %c [incr cp]]
+    }
+} -body {
+    regexp -about $e
+} -cleanup {
+    unset -nocomplain e cp
+} -returnCodes error  -match glob -result {*too many colors*}
 
 test regexp-23.1 {regexp -all and -line} {
     set string ""
diff --git a/tests/set-old.test b/tests/set-old.test
index 52dc0ff..4c25ec5 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -678,6 +678,11 @@ test set-old-8.57 {array command, array get with trivial pattern} {
     set a(y) 2
     array get a x
 } {x 1}
+test set-old-8.58 {array command, array set with LVT and odd length literal} {
+    list [catch {apply {{} {
+	array set a {b c d}
+    }}} msg] $msg
+} {1 {list must have an even number of elements}}
 
 test set-old-9.1 {ids for array enumeration} {
     catch {unset a}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0eea33a..3b14752 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -614,9 +614,6 @@ doc:
 ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
 	rm -f $@
 	@MAKE_LIB@
-	@if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
-	    cp ${ZLIB_DIR}/win32/zlib1.dll .;\
-	fi
 
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
@@ -787,11 +784,6 @@ install-binaries: binaries
 		else true; \
 		fi; \
 	    done;
-	@if test "x$(DLL_INSTALL_DIR)" = "x$(BIN_INSTALL_DIR)"; then\
-	    echo "Installing zlib1.dll to $(BIN_INSTALL_DIR)/";\
-	    $(INSTALL_LIBRARY) zlib1.dll "$(BIN_INSTALL_DIR)";\
-	    chmod 555 "$(BIN_INSTALL_DIR)/zlib1.dll";\
-	fi
 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
 	@@INSTALL_LIB@
 	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
@@ -839,8 +831,8 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
 	    done;
-	@echo "Installing package http 2.8.6 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.6.tm;
+	@echo "Installing package http 2.8.7 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm;
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
diff --git a/unix/configure b/unix/configure
index c178bf1..8a9a462 100755
--- a/unix/configure
+++ b/unix/configure
@@ -14384,11 +14384,7 @@ _ACEOF
 #	lack blkcnt_t.
 #--------------------------------------------------------------------
 
-if test "$ac_cv_cygwin" = "yes"; then
-    if test "x${SHARED_BUILD}" = "x1"; then
-	TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
-    fi
-else
+if test "$ac_cv_cygwin" != "yes"; then
     echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
 echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
diff --git a/unix/configure.in b/unix/configure.in
index 19db579..dca8b8c 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -310,11 +310,7 @@ SC_TIME_HANDLER
 #	lack blkcnt_t.
 #--------------------------------------------------------------------
 
-if test "$ac_cv_cygwin" = "yes"; then
-    if test "x${SHARED_BUILD}" = "x1"; then
-	TCL_SHLIB_LD_EXTRAS="${TCL_SHLIB_LD_EXTRAS} \${COMPAT_DIR}/zlib/win32/zdll.lib"
-    fi
-else
+if test "$ac_cv_cygwin" != "yes"; then
     AC_CHECK_MEMBERS([struct stat.st_blocks, struct stat.st_blksize])
 fi
 AC_CHECK_TYPES([blkcnt_t])
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index ad61d77..f102496 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -144,7 +144,7 @@ Pkgb_Init(
     if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
-    code = Tcl_PkgProvideEx(interp, "Pkgb", "2.3", NULL);
+    code = Tcl_PkgProvide(interp, "Pkgb", "2.3");
     if (code != TCL_OK) {
 	return code;
     }
@@ -181,7 +181,7 @@ Pkgb_SafeInit(
     if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
-    code = Tcl_PkgProvideEx(interp, "Pkgb", "2.3", NULL);
+    code = Tcl_PkgProvide(interp, "Pkgb", "2.3");
     if (code != TCL_OK) {
 	return code;
     }
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 636c760..fde1909 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -99,9 +99,11 @@ typedef off_t		Tcl_SeekOffset;
 #   define USE_PUTENV 1
 #   define USE_PUTENV_FOR_UNSET 1
 /* On Cygwin, the environment is imported from the Cygwin DLL. */
+#ifndef __x86_64__
 #   define environ __cygwin_environ
-#   define timezone _timezone
     extern char **__cygwin_environ;
+#endif
+#   define timezone _timezone
     extern int TclOSstat(const char *name, void *statBuf);
     extern int TclOSlstat(const char *name, void *statBuf);
 #elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
diff --git a/win/Makefile.in b/win/Makefile.in
index 99009b9..6f5211e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -639,8 +639,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
-	@echo "Installing package http 2.8.6 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.6.tm;
+	@echo "Installing package http 2.8.7 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.7.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \