Merge 8.7

23 files changed, 906 insertions, 444 deletions

diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 1c9909c..e8a534f 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -442,7 +442,7 @@ Tcl_ReadObjCmd(
 	    if (strcmp(TclGetString(objv[i]), "nonewline") != 0) {
 #endif
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"Expected non-negative integer but got \"%s\"",
+			"expected non-negative integer but got \"%s\"",
 			TclGetString(objv[i])));
 		Tcl_SetErrorCode(interp, "TCL", "VALUE", "NUMBER", NULL);
 		return TCL_ERROR;
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 302ac17..70cf8fa 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -2950,7 +2950,7 @@ ChildExpose(
 
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"Permission denied: safe interpreter cannot expose commands",
+		"permission denied: safe interpreter cannot expose commands",
 		-1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		NULL);
@@ -2995,7 +2995,7 @@ ChildRecursionLimit(
 
     if (objc) {
 	if (Tcl_IsSafe(interp)) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj("Permission denied: "
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj("permission denied: "
 		    "safe interpreters cannot change recursion limit", -1));
 	    Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		    NULL);
@@ -3056,7 +3056,7 @@ ChildHide(
 
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"Permission denied: safe interpreter cannot hide commands",
+		"permission denied: safe interpreter cannot hide commands",
 		-1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		NULL);
@@ -3218,7 +3218,7 @@ ChildMarkTrusted(
 {
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"Permission denied: safe interpreter cannot mark trusted",
+		"permission denied: safe interpreter cannot mark trusted",
 		-1));
 	Tcl_SetErrorCode(interp, "TCL", "OPERATION", "INTERP", "UNSAFE",
 		NULL);
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 87aed3a..aefc84f 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2350,6 +2350,8 @@ SetFsPathFromAny(
     fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath));
 
     if (transPtr == pathPtr) {
+	Tcl_GetStringFromObj(pathPtr, NULL);
+	TclFreeInternalRep(pathPtr);
         transPtr = Tcl_DuplicateObj(pathPtr);
         fsPathPtr->filesystemEpoch = 0;
     } else {
diff --git a/generic/tclPosixStr.c b/generic/tclPosixStr.c
index d4c20fa..2843998 100644
--- a/generic/tclPosixStr.c
+++ b/generic/tclPosixStr.c
@@ -697,7 +697,7 @@ Tcl_ErrnoMsg(
     case ENAMETOOLONG: return "File name too long";
 #endif
 #ifdef ENAVAIL
-    case ENAVAIL: return "No XENIX semaphores available";
+    case ENAVAIL: return "Not available";
 #endif
 #ifdef ENET
     case ENET: return "ENET";
@@ -787,7 +787,7 @@ Tcl_ErrnoMsg(
     case ENOTEMPTY: return "Directory not empty";
 #endif
 #ifdef ENOTNAM
-    case ENOTNAM: return "Not a XENIX named type file";
+    case ENOTNAM: return "Not a name file";
 #endif
 #ifdef ENOTSOCK
     case ENOTSOCK: return "Socket operation on non-socket";
diff --git a/generic/tclResult.c b/generic/tclResult.c
index 620c939..7e108e9 100644
--- a/generic/tclResult.c
+++ b/generic/tclResult.c
@@ -1474,7 +1474,7 @@ TclMergeReturnOptions(
 	     */
 
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-                    "bad -level value: Expected non-negative integer but got"
+                    "bad -level value: expected non-negative integer but got"
                     " \"%s\"", TclGetString(valuePtr)));
 	    Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_LEVEL", NULL);
 	    goto error;
diff --git a/library/tzdata/Africa/Cairo b/library/tzdata/Africa/Cairo
index aaeec54..3acbd5e 100644
--- a/library/tzdata/Africa/Cairo
+++ b/library/tzdata/Africa/Cairo
@@ -129,4 +129,158 @@ set TZData(:Africa/Cairo) {
     {1403816400 7200 0 EET}
     {1406844000 10800 1 EEST}
     {1411678800 7200 0 EET}
+    {1682632800 10800 1 EEST}
+    {1698354000 7200 0 EET}
+    {1714082400 10800 1 EEST}
+    {1730408400 7200 0 EET}
+    {1745532000 10800 1 EEST}
+    {1761858000 7200 0 EET}
+    {1776981600 10800 1 EEST}
+    {1793307600 7200 0 EET}
+    {1809036000 10800 1 EEST}
+    {1824757200 7200 0 EET}
+    {1840485600 10800 1 EEST}
+    {1856206800 7200 0 EET}
+    {1871935200 10800 1 EEST}
+    {1887656400 7200 0 EET}
+    {1903384800 10800 1 EEST}
+    {1919710800 7200 0 EET}
+    {1934834400 10800 1 EEST}
+    {1951160400 7200 0 EET}
+    {1966888800 10800 1 EEST}
+    {1982610000 7200 0 EET}
+    {1998338400 10800 1 EEST}
+    {2014059600 7200 0 EET}
+    {2029788000 10800 1 EEST}
+    {2045509200 7200 0 EET}
+    {2061237600 10800 1 EEST}
+    {2076958800 7200 0 EET}
+    {2092687200 10800 1 EEST}
+    {2109013200 7200 0 EET}
+    {2124136800 10800 1 EEST}
+    {2140462800 7200 0 EET}
+    {2156191200 10800 1 EEST}
+    {2171912400 7200 0 EET}
+    {2187640800 10800 1 EEST}
+    {2203362000 7200 0 EET}
+    {2219090400 10800 1 EEST}
+    {2234811600 7200 0 EET}
+    {2250540000 10800 1 EEST}
+    {2266866000 7200 0 EET}
+    {2281989600 10800 1 EEST}
+    {2298315600 7200 0 EET}
+    {2313439200 10800 1 EEST}
+    {2329765200 7200 0 EET}
+    {2345493600 10800 1 EEST}
+    {2361214800 7200 0 EET}
+    {2376943200 10800 1 EEST}
+    {2392664400 7200 0 EET}
+    {2408392800 10800 1 EEST}
+    {2424114000 7200 0 EET}
+    {2439842400 10800 1 EEST}
+    {2456168400 7200 0 EET}
+    {2471292000 10800 1 EEST}
+    {2487618000 7200 0 EET}
+    {2503346400 10800 1 EEST}
+    {2519067600 7200 0 EET}
+    {2534796000 10800 1 EEST}
+    {2550517200 7200 0 EET}
+    {2566245600 10800 1 EEST}
+    {2581966800 7200 0 EET}
+    {2597695200 10800 1 EEST}
+    {2614021200 7200 0 EET}
+    {2629144800 10800 1 EEST}
+    {2645470800 7200 0 EET}
+    {2660594400 10800 1 EEST}
+    {2676920400 7200 0 EET}
+    {2692648800 10800 1 EEST}
+    {2708370000 7200 0 EET}
+    {2724098400 10800 1 EEST}
+    {2739819600 7200 0 EET}
+    {2755548000 10800 1 EEST}
+    {2771269200 7200 0 EET}
+    {2786997600 10800 1 EEST}
+    {2803323600 7200 0 EET}
+    {2818447200 10800 1 EEST}
+    {2834773200 7200 0 EET}
+    {2850501600 10800 1 EEST}
+    {2866222800 7200 0 EET}
+    {2881951200 10800 1 EEST}
+    {2897672400 7200 0 EET}
+    {2913400800 10800 1 EEST}
+    {2929122000 7200 0 EET}
+    {2944850400 10800 1 EEST}
+    {2960571600 7200 0 EET}
+    {2976300000 10800 1 EEST}
+    {2992626000 7200 0 EET}
+    {3007749600 10800 1 EEST}
+    {3024075600 7200 0 EET}
+    {3039804000 10800 1 EEST}
+    {3055525200 7200 0 EET}
+    {3071253600 10800 1 EEST}
+    {3086974800 7200 0 EET}
+    {3102703200 10800 1 EEST}
+    {3118424400 7200 0 EET}
+    {3134152800 10800 1 EEST}
+    {3150478800 7200 0 EET}
+    {3165602400 10800 1 EEST}
+    {3181928400 7200 0 EET}
+    {3197052000 10800 1 EEST}
+    {3213378000 7200 0 EET}
+    {3229106400 10800 1 EEST}
+    {3244827600 7200 0 EET}
+    {3260556000 10800 1 EEST}
+    {3276277200 7200 0 EET}
+    {3292005600 10800 1 EEST}
+    {3307726800 7200 0 EET}
+    {3323455200 10800 1 EEST}
+    {3339781200 7200 0 EET}
+    {3354904800 10800 1 EEST}
+    {3371230800 7200 0 EET}
+    {3386959200 10800 1 EEST}
+    {3402680400 7200 0 EET}
+    {3418408800 10800 1 EEST}
+    {3434130000 7200 0 EET}
+    {3449858400 10800 1 EEST}
+    {3465579600 7200 0 EET}
+    {3481308000 10800 1 EEST}
+    {3497634000 7200 0 EET}
+    {3512757600 10800 1 EEST}
+    {3529083600 7200 0 EET}
+    {3544207200 10800 1 EEST}
+    {3560533200 7200 0 EET}
+    {3576261600 10800 1 EEST}
+    {3591982800 7200 0 EET}
+    {3607711200 10800 1 EEST}
+    {3623432400 7200 0 EET}
+    {3639160800 10800 1 EEST}
+    {3654882000 7200 0 EET}
+    {3670610400 10800 1 EEST}
+    {3686936400 7200 0 EET}
+    {3702060000 10800 1 EEST}
+    {3718386000 7200 0 EET}
+    {3734114400 10800 1 EEST}
+    {3749835600 7200 0 EET}
+    {3765564000 10800 1 EEST}
+    {3781285200 7200 0 EET}
+    {3797013600 10800 1 EEST}
+    {3812734800 7200 0 EET}
+    {3828463200 10800 1 EEST}
+    {3844184400 7200 0 EET}
+    {3859912800 10800 1 EEST}
+    {3876238800 7200 0 EET}
+    {3891362400 10800 1 EEST}
+    {3907688400 7200 0 EET}
+    {3923416800 10800 1 EEST}
+    {3939138000 7200 0 EET}
+    {3954866400 10800 1 EEST}
+    {3970587600 7200 0 EET}
+    {3986316000 10800 1 EEST}
+    {4002037200 7200 0 EET}
+    {4017765600 10800 1 EEST}
+    {4034091600 7200 0 EET}
+    {4049215200 10800 1 EEST}
+    {4065541200 7200 0 EET}
+    {4080664800 10800 1 EEST}
+    {4096990800 7200 0 EET}
 }
diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index cb60740..05ae49f 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -66,7 +66,7 @@ set TZData(:Africa/Casablanca) {
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682820000 3600 0 +01}
+    {1682215200 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -82,7 +82,7 @@ set TZData(:Africa/Casablanca) {
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927764000 3600 0 +01}
+    {1927159200 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -98,7 +98,7 @@ set TZData(:Africa/Casablanca) {
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172708000 3600 0 +01}
+    {2172103200 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -114,7 +114,7 @@ set TZData(:Africa/Casablanca) {
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417652000 3600 0 +01}
+    {2417047200 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -130,7 +130,7 @@ set TZData(:Africa/Casablanca) {
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2662596000 3600 0 +01}
+    {2661991200 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -146,7 +146,7 @@ set TZData(:Africa/Casablanca) {
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2907540000 3600 0 +01}
+    {2906935200 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
@@ -162,7 +162,7 @@ set TZData(:Africa/Casablanca) {
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3152484000 3600 0 +01}
+    {3151879200 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
@@ -178,7 +178,7 @@ set TZData(:Africa/Casablanca) {
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3397428000 3600 0 +01}
+    {3396823200 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
@@ -188,13 +188,13 @@ set TZData(:Africa/Casablanca) {
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3550442400 3600 0 +01}
+    {3549837600 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3642372000 3600 0 +01}
+    {3641767200 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
diff --git a/library/tzdata/Africa/El_Aaiun b/library/tzdata/Africa/El_Aaiun
index fd3e88f..8dbbdea 100644
--- a/library/tzdata/Africa/El_Aaiun
+++ b/library/tzdata/Africa/El_Aaiun
@@ -55,7 +55,7 @@ set TZData(:Africa/El_Aaiun) {
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682820000 3600 0 +01}
+    {1682215200 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -71,7 +71,7 @@ set TZData(:Africa/El_Aaiun) {
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927764000 3600 0 +01}
+    {1927159200 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -87,7 +87,7 @@ set TZData(:Africa/El_Aaiun) {
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172708000 3600 0 +01}
+    {2172103200 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -103,7 +103,7 @@ set TZData(:Africa/El_Aaiun) {
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417652000 3600 0 +01}
+    {2417047200 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -119,7 +119,7 @@ set TZData(:Africa/El_Aaiun) {
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2662596000 3600 0 +01}
+    {2661991200 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -135,7 +135,7 @@ set TZData(:Africa/El_Aaiun) {
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2907540000 3600 0 +01}
+    {2906935200 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
@@ -151,7 +151,7 @@ set TZData(:Africa/El_Aaiun) {
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3152484000 3600 0 +01}
+    {3151879200 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
@@ -167,7 +167,7 @@ set TZData(:Africa/El_Aaiun) {
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3397428000 3600 0 +01}
+    {3396823200 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
@@ -177,13 +177,13 @@ set TZData(:Africa/El_Aaiun) {
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3550442400 3600 0 +01}
+    {3549837600 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3642372000 3600 0 +01}
+    {3641767200 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
diff --git a/library/tzdata/America/Ciudad_Juarez b/library/tzdata/America/Ciudad_Juarez
new file mode 100644
index 0000000..5a27e80
--- /dev/null
+++ b/library/tzdata/America/Ciudad_Juarez
@@ -0,0 +1,223 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:America/Ciudad_Juarez) {
+    {-9223372036854775808 -25556 0 LMT}
+    {-1514739600 -25200 0 MST}
+    {-1343066400 -21600 0 CST}
+    {-1234807200 -25200 0 MST}
+    {-1220292000 -21600 1 MDT}
+    {-1207159200 -25200 0 MST}
+    {-1191344400 -21600 0 CST}
+    {820476000 -21600 0 CST}
+    {828864000 -18000 1 CDT}
+    {846399600 -21600 0 CST}
+    {860313600 -18000 1 CDT}
+    {877849200 -21600 0 CST}
+    {883634400 -21600 0 CST}
+    {891766800 -21600 0 MDT}
+    {909302400 -25200 0 MST}
+    {923216400 -21600 1 MDT}
+    {941356800 -25200 0 MST}
+    {954666000 -21600 1 MDT}
+    {972806400 -25200 0 MST}
+    {989139600 -21600 1 MDT}
+    {1001836800 -25200 0 MST}
+    {1018170000 -21600 1 MDT}
+    {1035705600 -25200 0 MST}
+    {1049619600 -21600 1 MDT}
+    {1067155200 -25200 0 MST}
+    {1081069200 -21600 1 MDT}
+    {1099209600 -25200 0 MST}
+    {1112518800 -21600 1 MDT}
+    {1130659200 -25200 0 MST}
+    {1143968400 -21600 1 MDT}
+    {1162108800 -25200 0 MST}
+    {1175418000 -21600 1 MDT}
+    {1193558400 -25200 0 MST}
+    {1207472400 -21600 1 MDT}
+    {1225008000 -25200 0 MST}
+    {1238922000 -21600 1 MDT}
+    {1256457600 -25200 0 MST}
+    {1262329200 -25200 0 MST}
+    {1268557200 -21600 1 MDT}
+    {1289116800 -25200 0 MST}
+    {1300006800 -21600 1 MDT}
+    {1320566400 -25200 0 MST}
+    {1331456400 -21600 1 MDT}
+    {1352016000 -25200 0 MST}
+    {1362906000 -21600 1 MDT}
+    {1383465600 -25200 0 MST}
+    {1394355600 -21600 1 MDT}
+    {1414915200 -25200 0 MST}
+    {1425805200 -21600 1 MDT}
+    {1446364800 -25200 0 MST}
+    {1457859600 -21600 1 MDT}
+    {1478419200 -25200 0 MST}
+    {1489309200 -21600 1 MDT}
+    {1509868800 -25200 0 MST}
+    {1520758800 -21600 1 MDT}
+    {1541318400 -25200 0 MST}
+    {1552208400 -21600 1 MDT}
+    {1572768000 -25200 0 MST}
+    {1583658000 -21600 1 MDT}
+    {1604217600 -25200 0 MST}
+    {1615712400 -21600 1 MDT}
+    {1636272000 -25200 0 MST}
+    {1647162000 -21600 1 MDT}
+    {1667120400 -21600 0 CST}
+    {1669788000 -25200 0 MST}
+    {1678611600 -21600 1 MDT}
+    {1699171200 -25200 0 MST}
+    {1710061200 -21600 1 MDT}
+    {1730620800 -25200 0 MST}
+    {1741510800 -21600 1 MDT}
+    {1762070400 -25200 0 MST}
+    {1772960400 -21600 1 MDT}
+    {1793520000 -25200 0 MST}
+    {1805014800 -21600 1 MDT}
+    {1825574400 -25200 0 MST}
+    {1836464400 -21600 1 MDT}
+    {1857024000 -25200 0 MST}
+    {1867914000 -21600 1 MDT}
+    {1888473600 -25200 0 MST}
+    {1899363600 -21600 1 MDT}
+    {1919923200 -25200 0 MST}
+    {1930813200 -21600 1 MDT}
+    {1951372800 -25200 0 MST}
+    {1962867600 -21600 1 MDT}
+    {1983427200 -25200 0 MST}
+    {1994317200 -21600 1 MDT}
+    {2014876800 -25200 0 MST}
+    {2025766800 -21600 1 MDT}
+    {2046326400 -25200 0 MST}
+    {2057216400 -21600 1 MDT}
+    {2077776000 -25200 0 MST}
+    {2088666000 -21600 1 MDT}
+    {2109225600 -25200 0 MST}
+    {2120115600 -21600 1 MDT}
+    {2140675200 -25200 0 MST}
+    {2152170000 -21600 1 MDT}
+    {2172729600 -25200 0 MST}
+    {2183619600 -21600 1 MDT}
+    {2204179200 -25200 0 MST}
+    {2215069200 -21600 1 MDT}
+    {2235628800 -25200 0 MST}
+    {2246518800 -21600 1 MDT}
+    {2267078400 -25200 0 MST}
+    {2277968400 -21600 1 MDT}
+    {2298528000 -25200 0 MST}
+    {2309418000 -21600 1 MDT}
+    {2329977600 -25200 0 MST}
+    {2341472400 -21600 1 MDT}
+    {2362032000 -25200 0 MST}
+    {2372922000 -21600 1 MDT}
+    {2393481600 -25200 0 MST}
+    {2404371600 -21600 1 MDT}
+    {2424931200 -25200 0 MST}
+    {2435821200 -21600 1 MDT}
+    {2456380800 -25200 0 MST}
+    {2467270800 -21600 1 MDT}
+    {2487830400 -25200 0 MST}
+    {2499325200 -21600 1 MDT}
+    {2519884800 -25200 0 MST}
+    {2530774800 -21600 1 MDT}
+    {2551334400 -25200 0 MST}
+    {2562224400 -21600 1 MDT}
+    {2582784000 -25200 0 MST}
+    {2593674000 -21600 1 MDT}
+    {2614233600 -25200 0 MST}
+    {2625123600 -21600 1 MDT}
+    {2645683200 -25200 0 MST}
+    {2656573200 -21600 1 MDT}
+    {2677132800 -25200 0 MST}
+    {2688627600 -21600 1 MDT}
+    {2709187200 -25200 0 MST}
+    {2720077200 -21600 1 MDT}
+    {2740636800 -25200 0 MST}
+    {2751526800 -21600 1 MDT}
+    {2772086400 -25200 0 MST}
+    {2782976400 -21600 1 MDT}
+    {2803536000 -25200 0 MST}
+    {2814426000 -21600 1 MDT}
+    {2834985600 -25200 0 MST}
+    {2846480400 -21600 1 MDT}
+    {2867040000 -25200 0 MST}
+    {2877930000 -21600 1 MDT}
+    {2898489600 -25200 0 MST}
+    {2909379600 -21600 1 MDT}
+    {2929939200 -25200 0 MST}
+    {2940829200 -21600 1 MDT}
+    {2961388800 -25200 0 MST}
+    {2972278800 -21600 1 MDT}
+    {2992838400 -25200 0 MST}
+    {3003728400 -21600 1 MDT}
+    {3024288000 -25200 0 MST}
+    {3035782800 -21600 1 MDT}
+    {3056342400 -25200 0 MST}
+    {3067232400 -21600 1 MDT}
+    {3087792000 -25200 0 MST}
+    {3098682000 -21600 1 MDT}
+    {3119241600 -25200 0 MST}
+    {3130131600 -21600 1 MDT}
+    {3150691200 -25200 0 MST}
+    {3161581200 -21600 1 MDT}
+    {3182140800 -25200 0 MST}
+    {3193030800 -21600 1 MDT}
+    {3213590400 -25200 0 MST}
+    {3225085200 -21600 1 MDT}
+    {3245644800 -25200 0 MST}
+    {3256534800 -21600 1 MDT}
+    {3277094400 -25200 0 MST}
+    {3287984400 -21600 1 MDT}
+    {3308544000 -25200 0 MST}
+    {3319434000 -21600 1 MDT}
+    {3339993600 -25200 0 MST}
+    {3350883600 -21600 1 MDT}
+    {3371443200 -25200 0 MST}
+    {3382938000 -21600 1 MDT}
+    {3403497600 -25200 0 MST}
+    {3414387600 -21600 1 MDT}
+    {3434947200 -25200 0 MST}
+    {3445837200 -21600 1 MDT}
+    {3466396800 -25200 0 MST}
+    {3477286800 -21600 1 MDT}
+    {3497846400 -25200 0 MST}
+    {3508736400 -21600 1 MDT}
+    {3529296000 -25200 0 MST}
+    {3540186000 -21600 1 MDT}
+    {3560745600 -25200 0 MST}
+    {3572240400 -21600 1 MDT}
+    {3592800000 -25200 0 MST}
+    {3603690000 -21600 1 MDT}
+    {3624249600 -25200 0 MST}
+    {3635139600 -21600 1 MDT}
+    {3655699200 -25200 0 MST}
+    {3666589200 -21600 1 MDT}
+    {3687148800 -25200 0 MST}
+    {3698038800 -21600 1 MDT}
+    {3718598400 -25200 0 MST}
+    {3730093200 -21600 1 MDT}
+    {3750652800 -25200 0 MST}
+    {3761542800 -21600 1 MDT}
+    {3782102400 -25200 0 MST}
+    {3792992400 -21600 1 MDT}
+    {3813552000 -25200 0 MST}
+    {3824442000 -21600 1 MDT}
+    {3845001600 -25200 0 MST}
+    {3855891600 -21600 1 MDT}
+    {3876451200 -25200 0 MST}
+    {3887341200 -21600 1 MDT}
+    {3907900800 -25200 0 MST}
+    {3919395600 -21600 1 MDT}
+    {3939955200 -25200 0 MST}
+    {3950845200 -21600 1 MDT}
+    {3971404800 -25200 0 MST}
+    {3982294800 -21600 1 MDT}
+    {4002854400 -25200 0 MST}
+    {4013744400 -21600 1 MDT}
+    {4034304000 -25200 0 MST}
+    {4045194000 -21600 1 MDT}
+    {4065753600 -25200 0 MST}
+    {4076643600 -21600 1 MDT}
+    {4097203200 -25200 0 MST}
+}
diff --git a/library/tzdata/America/Nuuk b/library/tzdata/America/Nuuk
index d010cab..06b472c 100644
--- a/library/tzdata/America/Nuuk
+++ b/library/tzdata/America/Nuuk
@@ -89,5 +89,158 @@ set TZData(:America/Nuuk) {
     {1635642000 -10800 0 -03}
     {1648342800 -7200 1 -02}
     {1667091600 -10800 0 -03}
-    {1679792400 -7200 0 -02}
+    {1679792400 -7200 1 -02}
+    {1698541200 -7200 0 -02}
+    {1711846800 -3600 1 -01}
+    {1729990800 -7200 0 -02}
+    {1743296400 -3600 1 -01}
+    {1761440400 -7200 0 -02}
+    {1774746000 -3600 1 -01}
+    {1792890000 -7200 0 -02}
+    {1806195600 -3600 1 -01}
+    {1824944400 -7200 0 -02}
+    {1837645200 -3600 1 -01}
+    {1856394000 -7200 0 -02}
+    {1869094800 -3600 1 -01}
+    {1887843600 -7200 0 -02}
+    {1901149200 -3600 1 -01}
+    {1919293200 -7200 0 -02}
+    {1932598800 -3600 1 -01}
+    {1950742800 -7200 0 -02}
+    {1964048400 -3600 1 -01}
+    {1982797200 -7200 0 -02}
+    {1995498000 -3600 1 -01}
+    {2014246800 -7200 0 -02}
+    {2026947600 -3600 1 -01}
+    {2045696400 -7200 0 -02}
+    {2058397200 -3600 1 -01}
+    {2077146000 -7200 0 -02}
+    {2090451600 -3600 1 -01}
+    {2108595600 -7200 0 -02}
+    {2121901200 -3600 1 -01}
+    {2140045200 -7200 0 -02}
+    {2153350800 -3600 1 -01}
+    {2172099600 -7200 0 -02}
+    {2184800400 -3600 1 -01}
+    {2203549200 -7200 0 -02}
+    {2216250000 -3600 1 -01}
+    {2234998800 -7200 0 -02}
+    {2248304400 -3600 1 -01}
+    {2266448400 -7200 0 -02}
+    {2279754000 -3600 1 -01}
+    {2297898000 -7200 0 -02}
+    {2311203600 -3600 1 -01}
+    {2329347600 -7200 0 -02}
+    {2342653200 -3600 1 -01}
+    {2361402000 -7200 0 -02}
+    {2374102800 -3600 1 -01}
+    {2392851600 -7200 0 -02}
+    {2405552400 -3600 1 -01}
+    {2424301200 -7200 0 -02}
+    {2437606800 -3600 1 -01}
+    {2455750800 -7200 0 -02}
+    {2469056400 -3600 1 -01}
+    {2487200400 -7200 0 -02}
+    {2500506000 -3600 1 -01}
+    {2519254800 -7200 0 -02}
+    {2531955600 -3600 1 -01}
+    {2550704400 -7200 0 -02}
+    {2563405200 -3600 1 -01}
+    {2582154000 -7200 0 -02}
+    {2595459600 -3600 1 -01}
+    {2613603600 -7200 0 -02}
+    {2626909200 -3600 1 -01}
+    {2645053200 -7200 0 -02}
+    {2658358800 -3600 1 -01}
+    {2676502800 -7200 0 -02}
+    {2689808400 -3600 1 -01}
+    {2708557200 -7200 0 -02}
+    {2721258000 -3600 1 -01}
+    {2740006800 -7200 0 -02}
+    {2752707600 -3600 1 -01}
+    {2771456400 -7200 0 -02}
+    {2784762000 -3600 1 -01}
+    {2802906000 -7200 0 -02}
+    {2816211600 -3600 1 -01}
+    {2834355600 -7200 0 -02}
+    {2847661200 -3600 1 -01}
+    {2866410000 -7200 0 -02}
+    {2879110800 -3600 1 -01}
+    {2897859600 -7200 0 -02}
+    {2910560400 -3600 1 -01}
+    {2929309200 -7200 0 -02}
+    {2942010000 -3600 1 -01}
+    {2960758800 -7200 0 -02}
+    {2974064400 -3600 1 -01}
+    {2992208400 -7200 0 -02}
+    {3005514000 -3600 1 -01}
+    {3023658000 -7200 0 -02}
+    {3036963600 -3600 1 -01}
+    {3055712400 -7200 0 -02}
+    {3068413200 -3600 1 -01}
+    {3087162000 -7200 0 -02}
+    {3099862800 -3600 1 -01}
+    {3118611600 -7200 0 -02}
+    {3131917200 -3600 1 -01}
+    {3150061200 -7200 0 -02}
+    {3163366800 -3600 1 -01}
+    {3181510800 -7200 0 -02}
+    {3194816400 -3600 1 -01}
+    {3212960400 -7200 0 -02}
+    {3226266000 -3600 1 -01}
+    {3245014800 -7200 0 -02}
+    {3257715600 -3600 1 -01}
+    {3276464400 -7200 0 -02}
+    {3289165200 -3600 1 -01}
+    {3307914000 -7200 0 -02}
+    {3321219600 -3600 1 -01}
+    {3339363600 -7200 0 -02}
+    {3352669200 -3600 1 -01}
+    {3370813200 -7200 0 -02}
+    {3384118800 -3600 1 -01}
+    {3402867600 -7200 0 -02}
+    {3415568400 -3600 1 -01}
+    {3434317200 -7200 0 -02}
+    {3447018000 -3600 1 -01}
+    {3465766800 -7200 0 -02}
+    {3479072400 -3600 1 -01}
+    {3497216400 -7200 0 -02}
+    {3510522000 -3600 1 -01}
+    {3528666000 -7200 0 -02}
+    {3541971600 -3600 1 -01}
+    {3560115600 -7200 0 -02}
+    {3573421200 -3600 1 -01}
+    {3592170000 -7200 0 -02}
+    {3604870800 -3600 1 -01}
+    {3623619600 -7200 0 -02}
+    {3636320400 -3600 1 -01}
+    {3655069200 -7200 0 -02}
+    {3668374800 -3600 1 -01}
+    {3686518800 -7200 0 -02}
+    {3699824400 -3600 1 -01}
+    {3717968400 -7200 0 -02}
+    {3731274000 -3600 1 -01}
+    {3750022800 -7200 0 -02}
+    {3762723600 -3600 1 -01}
+    {3781472400 -7200 0 -02}
+    {3794173200 -3600 1 -01}
+    {3812922000 -7200 0 -02}
+    {3825622800 -3600 1 -01}
+    {3844371600 -7200 0 -02}
+    {3857677200 -3600 1 -01}
+    {3875821200 -7200 0 -02}
+    {3889126800 -3600 1 -01}
+    {3907270800 -7200 0 -02}
+    {3920576400 -3600 1 -01}
+    {3939325200 -7200 0 -02}
+    {3952026000 -3600 1 -01}
+    {3970774800 -7200 0 -02}
+    {3983475600 -3600 1 -01}
+    {4002224400 -7200 0 -02}
+    {4015530000 -3600 1 -01}
+    {4033674000 -7200 0 -02}
+    {4046979600 -3600 1 -01}
+    {4065123600 -7200 0 -02}
+    {4078429200 -3600 1 -01}
+    {4096573200 -7200 0 -02}
 }
diff --git a/library/tzdata/America/Yellowknife b/library/tzdata/America/Yellowknife
index 65ddbb6..69e171d 100644
--- a/library/tzdata/America/Yellowknife
+++ b/library/tzdata/America/Yellowknife
@@ -1,266 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Yellowknife) {
-    {-9223372036854775808 0 0 -00}
-    {-1104537600 -25200 0 MST}
-    {-880210800 -21600 1 MWT}
-    {-769395600 -21600 1 MPT}
-    {-765388800 -25200 0 MST}
-    {73472400 -21600 1 MDT}
-    {89193600 -25200 0 MST}
-    {104922000 -21600 1 MDT}
-    {120643200 -25200 0 MST}
-    {136371600 -21600 1 MDT}
-    {152092800 -25200 0 MST}
-    {167821200 -21600 1 MDT}
-    {183542400 -25200 0 MST}
-    {199270800 -21600 1 MDT}
-    {215596800 -25200 0 MST}
-    {230720400 -21600 1 MDT}
-    {247046400 -25200 0 MST}
-    {262774800 -21600 1 MDT}
-    {278496000 -25200 0 MST}
-    {294224400 -21600 1 MDT}
-    {309945600 -25200 0 MST}
-    {315558000 -25200 0 MST}
-    {325674000 -21600 1 MDT}
-    {341395200 -25200 0 MST}
-    {357123600 -21600 1 MDT}
-    {372844800 -25200 0 MST}
-    {388573200 -21600 1 MDT}
-    {404899200 -25200 0 MST}
-    {420022800 -21600 1 MDT}
-    {436348800 -25200 0 MST}
-    {452077200 -21600 1 MDT}
-    {467798400 -25200 0 MST}
-    {483526800 -21600 1 MDT}
-    {499248000 -25200 0 MST}
-    {514976400 -21600 1 MDT}
-    {530697600 -25200 0 MST}
-    {544611600 -21600 1 MDT}
-    {562147200 -25200 0 MST}
-    {576061200 -21600 1 MDT}
-    {594201600 -25200 0 MST}
-    {607510800 -21600 1 MDT}
-    {625651200 -25200 0 MST}
-    {638960400 -21600 1 MDT}
-    {657100800 -25200 0 MST}
-    {671014800 -21600 1 MDT}
-    {688550400 -25200 0 MST}
-    {702464400 -21600 1 MDT}
-    {720000000 -25200 0 MST}
-    {733914000 -21600 1 MDT}
-    {752054400 -25200 0 MST}
-    {765363600 -21600 1 MDT}
-    {783504000 -25200 0 MST}
-    {796813200 -21600 1 MDT}
-    {814953600 -25200 0 MST}
-    {828867600 -21600 1 MDT}
-    {846403200 -25200 0 MST}
-    {860317200 -21600 1 MDT}
-    {877852800 -25200 0 MST}
-    {891766800 -21600 1 MDT}
-    {909302400 -25200 0 MST}
-    {923216400 -21600 1 MDT}
-    {941356800 -25200 0 MST}
-    {954666000 -21600 1 MDT}
-    {972806400 -25200 0 MST}
-    {986115600 -21600 1 MDT}
-    {1004256000 -25200 0 MST}
-    {1018170000 -21600 1 MDT}
-    {1035705600 -25200 0 MST}
-    {1049619600 -21600 1 MDT}
-    {1067155200 -25200 0 MST}
-    {1081069200 -21600 1 MDT}
-    {1099209600 -25200 0 MST}
-    {1112518800 -21600 1 MDT}
-    {1130659200 -25200 0 MST}
-    {1143968400 -21600 1 MDT}
-    {1162108800 -25200 0 MST}
-    {1173603600 -21600 1 MDT}
-    {1194163200 -25200 0 MST}
-    {1205053200 -21600 1 MDT}
-    {1225612800 -25200 0 MST}
-    {1236502800 -21600 1 MDT}
-    {1257062400 -25200 0 MST}
-    {1268557200 -21600 1 MDT}
-    {1289116800 -25200 0 MST}
-    {1300006800 -21600 1 MDT}
-    {1320566400 -25200 0 MST}
-    {1331456400 -21600 1 MDT}
-    {1352016000 -25200 0 MST}
-    {1362906000 -21600 1 MDT}
-    {1383465600 -25200 0 MST}
-    {1394355600 -21600 1 MDT}
-    {1414915200 -25200 0 MST}
-    {1425805200 -21600 1 MDT}
-    {1446364800 -25200 0 MST}
-    {1457859600 -21600 1 MDT}
-    {1478419200 -25200 0 MST}
-    {1489309200 -21600 1 MDT}
-    {1509868800 -25200 0 MST}
-    {1520758800 -21600 1 MDT}
-    {1541318400 -25200 0 MST}
-    {1552208400 -21600 1 MDT}
-    {1572768000 -25200 0 MST}
-    {1583658000 -21600 1 MDT}
-    {1604217600 -25200 0 MST}
-    {1615712400 -21600 1 MDT}
-    {1636272000 -25200 0 MST}
-    {1647162000 -21600 1 MDT}
-    {1667721600 -25200 0 MST}
-    {1678611600 -21600 1 MDT}
-    {1699171200 -25200 0 MST}
-    {1710061200 -21600 1 MDT}
-    {1730620800 -25200 0 MST}
-    {1741510800 -21600 1 MDT}
-    {1762070400 -25200 0 MST}
-    {1772960400 -21600 1 MDT}
-    {1793520000 -25200 0 MST}
-    {1805014800 -21600 1 MDT}
-    {1825574400 -25200 0 MST}
-    {1836464400 -21600 1 MDT}
-    {1857024000 -25200 0 MST}
-    {1867914000 -21600 1 MDT}
-    {1888473600 -25200 0 MST}
-    {1899363600 -21600 1 MDT}
-    {1919923200 -25200 0 MST}
-    {1930813200 -21600 1 MDT}
-    {1951372800 -25200 0 MST}
-    {1962867600 -21600 1 MDT}
-    {1983427200 -25200 0 MST}
-    {1994317200 -21600 1 MDT}
-    {2014876800 -25200 0 MST}
-    {2025766800 -21600 1 MDT}
-    {2046326400 -25200 0 MST}
-    {2057216400 -21600 1 MDT}
-    {2077776000 -25200 0 MST}
-    {2088666000 -21600 1 MDT}
-    {2109225600 -25200 0 MST}
-    {2120115600 -21600 1 MDT}
-    {2140675200 -25200 0 MST}
-    {2152170000 -21600 1 MDT}
-    {2172729600 -25200 0 MST}
-    {2183619600 -21600 1 MDT}
-    {2204179200 -25200 0 MST}
-    {2215069200 -21600 1 MDT}
-    {2235628800 -25200 0 MST}
-    {2246518800 -21600 1 MDT}
-    {2267078400 -25200 0 MST}
-    {2277968400 -21600 1 MDT}
-    {2298528000 -25200 0 MST}
-    {2309418000 -21600 1 MDT}
-    {2329977600 -25200 0 MST}
-    {2341472400 -21600 1 MDT}
-    {2362032000 -25200 0 MST}
-    {2372922000 -21600 1 MDT}
-    {2393481600 -25200 0 MST}
-    {2404371600 -21600 1 MDT}
-    {2424931200 -25200 0 MST}
-    {2435821200 -21600 1 MDT}
-    {2456380800 -25200 0 MST}
-    {2467270800 -21600 1 MDT}
-    {2487830400 -25200 0 MST}
-    {2499325200 -21600 1 MDT}
-    {2519884800 -25200 0 MST}
-    {2530774800 -21600 1 MDT}
-    {2551334400 -25200 0 MST}
-    {2562224400 -21600 1 MDT}
-    {2582784000 -25200 0 MST}
-    {2593674000 -21600 1 MDT}
-    {2614233600 -25200 0 MST}
-    {2625123600 -21600 1 MDT}
-    {2645683200 -25200 0 MST}
-    {2656573200 -21600 1 MDT}
-    {2677132800 -25200 0 MST}
-    {2688627600 -21600 1 MDT}
-    {2709187200 -25200 0 MST}
-    {2720077200 -21600 1 MDT}
-    {2740636800 -25200 0 MST}
-    {2751526800 -21600 1 MDT}
-    {2772086400 -25200 0 MST}
-    {2782976400 -21600 1 MDT}
-    {2803536000 -25200 0 MST}
-    {2814426000 -21600 1 MDT}
-    {2834985600 -25200 0 MST}
-    {2846480400 -21600 1 MDT}
-    {2867040000 -25200 0 MST}
-    {2877930000 -21600 1 MDT}
-    {2898489600 -25200 0 MST}
-    {2909379600 -21600 1 MDT}
-    {2929939200 -25200 0 MST}
-    {2940829200 -21600 1 MDT}
-    {2961388800 -25200 0 MST}
-    {2972278800 -21600 1 MDT}
-    {2992838400 -25200 0 MST}
-    {3003728400 -21600 1 MDT}
-    {3024288000 -25200 0 MST}
-    {3035782800 -21600 1 MDT}
-    {3056342400 -25200 0 MST}
-    {3067232400 -21600 1 MDT}
-    {3087792000 -25200 0 MST}
-    {3098682000 -21600 1 MDT}
-    {3119241600 -25200 0 MST}
-    {3130131600 -21600 1 MDT}
-    {3150691200 -25200 0 MST}
-    {3161581200 -21600 1 MDT}
-    {3182140800 -25200 0 MST}
-    {3193030800 -21600 1 MDT}
-    {3213590400 -25200 0 MST}
-    {3225085200 -21600 1 MDT}
-    {3245644800 -25200 0 MST}
-    {3256534800 -21600 1 MDT}
-    {3277094400 -25200 0 MST}
-    {3287984400 -21600 1 MDT}
-    {3308544000 -25200 0 MST}
-    {3319434000 -21600 1 MDT}
-    {3339993600 -25200 0 MST}
-    {3350883600 -21600 1 MDT}
-    {3371443200 -25200 0 MST}
-    {3382938000 -21600 1 MDT}
-    {3403497600 -25200 0 MST}
-    {3414387600 -21600 1 MDT}
-    {3434947200 -25200 0 MST}
-    {3445837200 -21600 1 MDT}
-    {3466396800 -25200 0 MST}
-    {3477286800 -21600 1 MDT}
-    {3497846400 -25200 0 MST}
-    {3508736400 -21600 1 MDT}
-    {3529296000 -25200 0 MST}
-    {3540186000 -21600 1 MDT}
-    {3560745600 -25200 0 MST}
-    {3572240400 -21600 1 MDT}
-    {3592800000 -25200 0 MST}
-    {3603690000 -21600 1 MDT}
-    {3624249600 -25200 0 MST}
-    {3635139600 -21600 1 MDT}
-    {3655699200 -25200 0 MST}
-    {3666589200 -21600 1 MDT}
-    {3687148800 -25200 0 MST}
-    {3698038800 -21600 1 MDT}
-    {3718598400 -25200 0 MST}
-    {3730093200 -21600 1 MDT}
-    {3750652800 -25200 0 MST}
-    {3761542800 -21600 1 MDT}
-    {3782102400 -25200 0 MST}
-    {3792992400 -21600 1 MDT}
-    {3813552000 -25200 0 MST}
-    {3824442000 -21600 1 MDT}
-    {3845001600 -25200 0 MST}
-    {3855891600 -21600 1 MDT}
-    {3876451200 -25200 0 MST}
-    {3887341200 -21600 1 MDT}
-    {3907900800 -25200 0 MST}
-    {3919395600 -21600 1 MDT}
-    {3939955200 -25200 0 MST}
-    {3950845200 -21600 1 MDT}
-    {3971404800 -25200 0 MST}
-    {3982294800 -21600 1 MDT}
-    {4002854400 -25200 0 MST}
-    {4013744400 -21600 1 MDT}
-    {4034304000 -25200 0 MST}
-    {4045194000 -21600 1 MDT}
-    {4065753600 -25200 0 MST}
-    {4076643600 -21600 1 MDT}
-    {4097203200 -25200 0 MST}
+if {![info exists TZData(America/Edmonton)]} {
+    LoadTimeZoneFile America/Edmonton
 }
+set TZData(:America/Yellowknife) $TZData(:America/Edmonton)
diff --git a/library/tzdata/Asia/Beirut b/library/tzdata/Asia/Beirut
index ac0a64e..a01a53a 100644
--- a/library/tzdata/Asia/Beirut
+++ b/library/tzdata/Asia/Beirut
@@ -113,7 +113,7 @@ set TZData(:Asia/Beirut) {
     {1635627600 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1667077200 7200 0 EET}
-    {1679781600 10800 1 EEST}
+    {1682028000 10800 1 EEST}
     {1698526800 7200 0 EET}
     {1711836000 10800 1 EEST}
     {1729976400 7200 0 EET}
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 1ceb680..d3789d3 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -127,11 +127,11 @@ set TZData(:Asia/Gaza) {
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1666998000 7200 0 EET}
-    {1679702400 10800 1 EEST}
+    {1682726400 10800 1 EEST}
     {1698447600 7200 0 EET}
-    {1711756800 10800 1 EEST}
+    {1712966400 10800 1 EEST}
     {1729897200 7200 0 EET}
-    {1743206400 10800 1 EEST}
+    {1743811200 10800 1 EEST}
     {1761346800 7200 0 EET}
     {1774656000 10800 1 EEST}
     {1792796400 7200 0 EET}
@@ -154,48 +154,80 @@ set TZData(:Asia/Gaza) {
     {2058307200 10800 1 EEST}
     {2077052400 7200 0 EET}
     {2090361600 10800 1 EEST}
-    {2108502000 7200 0 EET}
+    {2107897200 7200 0 EET}
     {2121811200 10800 1 EEST}
-    {2139951600 7200 0 EET}
+    {2138742000 7200 0 EET}
     {2153260800 10800 1 EEST}
-    {2172006000 7200 0 EET}
+    {2168982000 7200 0 EET}
     {2184710400 10800 1 EEST}
+    {2199826800 7200 0 EET}
+    {2202854400 10800 1 EEST}
     {2203455600 7200 0 EET}
     {2216160000 10800 1 EEST}
+    {2230066800 7200 0 EET}
+    {2233699200 10800 1 EEST}
     {2234905200 7200 0 EET}
     {2248214400 10800 1 EEST}
+    {2260911600 7200 0 EET}
+    {2263939200 10800 1 EEST}
     {2266354800 7200 0 EET}
     {2279664000 10800 1 EEST}
+    {2291756400 7200 0 EET}
+    {2294784000 10800 1 EEST}
     {2297804400 7200 0 EET}
     {2311113600 10800 1 EEST}
+    {2321996400 7200 0 EET}
+    {2325628800 10800 1 EEST}
     {2329254000 7200 0 EET}
     {2342563200 10800 1 EEST}
+    {2352841200 7200 0 EET}
+    {2355868800 10800 1 EEST}
     {2361308400 7200 0 EET}
     {2374012800 10800 1 EEST}
+    {2383686000 7200 0 EET}
+    {2386713600 10800 1 EEST}
     {2392758000 7200 0 EET}
     {2405462400 10800 1 EEST}
+    {2413926000 7200 0 EET}
+    {2417558400 10800 1 EEST}
     {2424207600 7200 0 EET}
     {2437516800 10800 1 EEST}
+    {2444770800 7200 0 EET}
+    {2447798400 10800 1 EEST}
     {2455657200 7200 0 EET}
     {2468966400 10800 1 EEST}
+    {2475010800 7200 0 EET}
+    {2478643200 10800 1 EEST}
     {2487106800 7200 0 EET}
     {2500416000 10800 1 EEST}
+    {2505855600 7200 0 EET}
+    {2508883200 10800 1 EEST}
     {2519161200 7200 0 EET}
     {2531865600 10800 1 EEST}
+    {2536700400 7200 0 EET}
+    {2539728000 10800 1 EEST}
     {2550610800 7200 0 EET}
     {2563315200 10800 1 EEST}
+    {2566940400 7200 0 EET}
+    {2570572800 10800 1 EEST}
     {2582060400 7200 0 EET}
     {2595369600 10800 1 EEST}
+    {2597785200 7200 0 EET}
+    {2600812800 10800 1 EEST}
     {2613510000 7200 0 EET}
     {2626819200 10800 1 EEST}
+    {2628025200 7200 0 EET}
+    {2631657600 10800 1 EEST}
     {2644959600 7200 0 EET}
     {2658268800 10800 1 EEST}
+    {2658870000 7200 0 EET}
+    {2662502400 10800 1 EEST}
     {2676409200 7200 0 EET}
-    {2689718400 10800 1 EEST}
+    {2692742400 10800 1 EEST}
     {2708463600 7200 0 EET}
-    {2721168000 10800 1 EEST}
+    {2723587200 10800 1 EEST}
     {2739913200 7200 0 EET}
-    {2752617600 10800 1 EEST}
+    {2753827200 10800 1 EEST}
     {2771362800 7200 0 EET}
     {2784672000 10800 1 EEST}
     {2802812400 7200 0 EET}
@@ -218,42 +250,69 @@ set TZData(:Asia/Gaza) {
     {3068323200 10800 1 EEST}
     {3087068400 7200 0 EET}
     {3099772800 10800 1 EEST}
-    {3118518000 7200 0 EET}
+    {3117913200 7200 0 EET}
     {3131827200 10800 1 EEST}
-    {3149967600 7200 0 EET}
+    {3148758000 7200 0 EET}
     {3163276800 10800 1 EEST}
-    {3181417200 7200 0 EET}
+    {3179602800 7200 0 EET}
     {3194726400 10800 1 EEST}
-    {3212866800 7200 0 EET}
+    {3209842800 7200 0 EET}
     {3226176000 10800 1 EEST}
-    {3244921200 7200 0 EET}
-    {3257625600 10800 1 EEST}
-    {3276370800 7200 0 EET}
-    {3289075200 10800 1 EEST}
-    {3307820400 7200 0 EET}
-    {3321129600 10800 1 EEST}
+    {3240687600 7200 0 EET}
+    {3243715200 10800 1 EEST}
+    {3257622000 10800 1 EEST}
+    {3271532400 7200 0 EET}
+    {3274560000 10800 1 EEST}
+    {3289071600 10800 1 EEST}
+    {3301772400 7200 0 EET}
+    {3305404800 10800 1 EEST}
+    {3321126000 10800 1 EEST}
+    {3332617200 7200 0 EET}
+    {3335644800 10800 1 EEST}
     {3339270000 7200 0 EET}
     {3352579200 10800 1 EEST}
+    {3362857200 7200 0 EET}
+    {3366489600 10800 1 EEST}
     {3370719600 7200 0 EET}
     {3384028800 10800 1 EEST}
+    {3393702000 7200 0 EET}
+    {3397334400 10800 1 EEST}
     {3402774000 7200 0 EET}
     {3415478400 10800 1 EEST}
+    {3424546800 7200 0 EET}
+    {3427574400 10800 1 EEST}
     {3434223600 7200 0 EET}
     {3446928000 10800 1 EEST}
+    {3454786800 7200 0 EET}
+    {3458419200 10800 1 EEST}
     {3465673200 7200 0 EET}
     {3478982400 10800 1 EEST}
+    {3485631600 7200 0 EET}
+    {3488659200 10800 1 EEST}
     {3497122800 7200 0 EET}
     {3510432000 10800 1 EEST}
+    {3516476400 7200 0 EET}
+    {3519504000 10800 1 EEST}
     {3528572400 7200 0 EET}
     {3541881600 10800 1 EEST}
+    {3546716400 7200 0 EET}
+    {3550348800 10800 1 EEST}
     {3560022000 7200 0 EET}
     {3573331200 10800 1 EEST}
+    {3577561200 7200 0 EET}
+    {3580588800 10800 1 EEST}
     {3592076400 7200 0 EET}
     {3604780800 10800 1 EEST}
+    {3607801200 7200 0 EET}
+    {3611433600 10800 1 EEST}
     {3623526000 7200 0 EET}
     {3636230400 10800 1 EEST}
+    {3638646000 7200 0 EET}
+    {3642278400 10800 1 EEST}
     {3654975600 7200 0 EET}
     {3668284800 10800 1 EEST}
+    {3669490800 7200 0 EET}
+    {3672518400 10800 1 EEST}
     {3686425200 7200 0 EET}
     {3699734400 10800 1 EEST}
     {3717874800 7200 0 EET}
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index b92db8d..140c841 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -126,11 +126,11 @@ set TZData(:Asia/Hebron) {
     {1635458400 7200 0 EET}
     {1648332000 10800 1 EEST}
     {1666998000 7200 0 EET}
-    {1679702400 10800 1 EEST}
+    {1682726400 10800 1 EEST}
     {1698447600 7200 0 EET}
-    {1711756800 10800 1 EEST}
+    {1712966400 10800 1 EEST}
     {1729897200 7200 0 EET}
-    {1743206400 10800 1 EEST}
+    {1743811200 10800 1 EEST}
     {1761346800 7200 0 EET}
     {1774656000 10800 1 EEST}
     {1792796400 7200 0 EET}
@@ -153,48 +153,80 @@ set TZData(:Asia/Hebron) {
     {2058307200 10800 1 EEST}
     {2077052400 7200 0 EET}
     {2090361600 10800 1 EEST}
-    {2108502000 7200 0 EET}
+    {2107897200 7200 0 EET}
     {2121811200 10800 1 EEST}
-    {2139951600 7200 0 EET}
+    {2138742000 7200 0 EET}
     {2153260800 10800 1 EEST}
-    {2172006000 7200 0 EET}
+    {2168982000 7200 0 EET}
     {2184710400 10800 1 EEST}
+    {2199826800 7200 0 EET}
+    {2202854400 10800 1 EEST}
     {2203455600 7200 0 EET}
     {2216160000 10800 1 EEST}
+    {2230066800 7200 0 EET}
+    {2233699200 10800 1 EEST}
     {2234905200 7200 0 EET}
     {2248214400 10800 1 EEST}
+    {2260911600 7200 0 EET}
+    {2263939200 10800 1 EEST}
     {2266354800 7200 0 EET}
     {2279664000 10800 1 EEST}
+    {2291756400 7200 0 EET}
+    {2294784000 10800 1 EEST}
     {2297804400 7200 0 EET}
     {2311113600 10800 1 EEST}
+    {2321996400 7200 0 EET}
+    {2325628800 10800 1 EEST}
     {2329254000 7200 0 EET}
     {2342563200 10800 1 EEST}
+    {2352841200 7200 0 EET}
+    {2355868800 10800 1 EEST}
     {2361308400 7200 0 EET}
     {2374012800 10800 1 EEST}
+    {2383686000 7200 0 EET}
+    {2386713600 10800 1 EEST}
     {2392758000 7200 0 EET}
     {2405462400 10800 1 EEST}
+    {2413926000 7200 0 EET}
+    {2417558400 10800 1 EEST}
     {2424207600 7200 0 EET}
     {2437516800 10800 1 EEST}
+    {2444770800 7200 0 EET}
+    {2447798400 10800 1 EEST}
     {2455657200 7200 0 EET}
     {2468966400 10800 1 EEST}
+    {2475010800 7200 0 EET}
+    {2478643200 10800 1 EEST}
     {2487106800 7200 0 EET}
     {2500416000 10800 1 EEST}
+    {2505855600 7200 0 EET}
+    {2508883200 10800 1 EEST}
     {2519161200 7200 0 EET}
     {2531865600 10800 1 EEST}
+    {2536700400 7200 0 EET}
+    {2539728000 10800 1 EEST}
     {2550610800 7200 0 EET}
     {2563315200 10800 1 EEST}
+    {2566940400 7200 0 EET}
+    {2570572800 10800 1 EEST}
     {2582060400 7200 0 EET}
     {2595369600 10800 1 EEST}
+    {2597785200 7200 0 EET}
+    {2600812800 10800 1 EEST}
     {2613510000 7200 0 EET}
     {2626819200 10800 1 EEST}
+    {2628025200 7200 0 EET}
+    {2631657600 10800 1 EEST}
     {2644959600 7200 0 EET}
     {2658268800 10800 1 EEST}
+    {2658870000 7200 0 EET}
+    {2662502400 10800 1 EEST}
     {2676409200 7200 0 EET}
-    {2689718400 10800 1 EEST}
+    {2692742400 10800 1 EEST}
     {2708463600 7200 0 EET}
-    {2721168000 10800 1 EEST}
+    {2723587200 10800 1 EEST}
     {2739913200 7200 0 EET}
-    {2752617600 10800 1 EEST}
+    {2753827200 10800 1 EEST}
     {2771362800 7200 0 EET}
     {2784672000 10800 1 EEST}
     {2802812400 7200 0 EET}
@@ -217,42 +249,69 @@ set TZData(:Asia/Hebron) {
     {3068323200 10800 1 EEST}
     {3087068400 7200 0 EET}
     {3099772800 10800 1 EEST}
-    {3118518000 7200 0 EET}
+    {3117913200 7200 0 EET}
     {3131827200 10800 1 EEST}
-    {3149967600 7200 0 EET}
+    {3148758000 7200 0 EET}
     {3163276800 10800 1 EEST}
-    {3181417200 7200 0 EET}
+    {3179602800 7200 0 EET}
     {3194726400 10800 1 EEST}
-    {3212866800 7200 0 EET}
+    {3209842800 7200 0 EET}
     {3226176000 10800 1 EEST}
-    {3244921200 7200 0 EET}
-    {3257625600 10800 1 EEST}
-    {3276370800 7200 0 EET}
-    {3289075200 10800 1 EEST}
-    {3307820400 7200 0 EET}
-    {3321129600 10800 1 EEST}
+    {3240687600 7200 0 EET}
+    {3243715200 10800 1 EEST}
+    {3257622000 10800 1 EEST}
+    {3271532400 7200 0 EET}
+    {3274560000 10800 1 EEST}
+    {3289071600 10800 1 EEST}
+    {3301772400 7200 0 EET}
+    {3305404800 10800 1 EEST}
+    {3321126000 10800 1 EEST}
+    {3332617200 7200 0 EET}
+    {3335644800 10800 1 EEST}
     {3339270000 7200 0 EET}
     {3352579200 10800 1 EEST}
+    {3362857200 7200 0 EET}
+    {3366489600 10800 1 EEST}
     {3370719600 7200 0 EET}
     {3384028800 10800 1 EEST}
+    {3393702000 7200 0 EET}
+    {3397334400 10800 1 EEST}
     {3402774000 7200 0 EET}
     {3415478400 10800 1 EEST}
+    {3424546800 7200 0 EET}
+    {3427574400 10800 1 EEST}
     {3434223600 7200 0 EET}
     {3446928000 10800 1 EEST}
+    {3454786800 7200 0 EET}
+    {3458419200 10800 1 EEST}
     {3465673200 7200 0 EET}
     {3478982400 10800 1 EEST}
+    {3485631600 7200 0 EET}
+    {3488659200 10800 1 EEST}
     {3497122800 7200 0 EET}
     {3510432000 10800 1 EEST}
+    {3516476400 7200 0 EET}
+    {3519504000 10800 1 EEST}
     {3528572400 7200 0 EET}
     {3541881600 10800 1 EEST}
+    {3546716400 7200 0 EET}
+    {3550348800 10800 1 EEST}
     {3560022000 7200 0 EET}
     {3573331200 10800 1 EEST}
+    {3577561200 7200 0 EET}
+    {3580588800 10800 1 EEST}
     {3592076400 7200 0 EET}
     {3604780800 10800 1 EEST}
+    {3607801200 7200 0 EET}
+    {3611433600 10800 1 EEST}
     {3623526000 7200 0 EET}
     {3636230400 10800 1 EEST}
+    {3638646000 7200 0 EET}
+    {3642278400 10800 1 EEST}
     {3654975600 7200 0 EET}
     {3668284800 10800 1 EEST}
+    {3669490800 7200 0 EET}
+    {3672518400 10800 1 EEST}
     {3686425200 7200 0 EET}
     {3699734400 10800 1 EEST}
     {3717874800 7200 0 EET}
diff --git a/library/tzdata/Europe/Kirov b/library/tzdata/Europe/Kirov
index 8762d22..9d2afa5 100644
--- a/library/tzdata/Europe/Kirov
+++ b/library/tzdata/Europe/Kirov
@@ -20,51 +20,51 @@ set TZData(:Europe/Kirov) {
     {559692000 14400 0 +04}
     {575416800 18000 1 +05}
     {591141600 14400 0 +04}
-    {606866400 10800 0 +04}
-    {606870000 14400 1 +04}
-    {622594800 10800 0 +03}
-    {638319600 14400 1 +04}
-    {654649200 10800 0 +03}
+    {606866400 10800 0 MSD}
+    {606870000 14400 1 MSD}
+    {622594800 10800 0 MSK}
+    {638319600 14400 1 MSD}
+    {654649200 10800 0 MSK}
     {670374000 14400 0 +04}
-    {701820000 10800 0 +04}
-    {701823600 14400 1 +04}
-    {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
-    {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
-    {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
-    {811897200 10800 0 +03}
-    {828226800 14400 1 +04}
-    {846370800 10800 0 +03}
-    {859676400 14400 1 +04}
-    {877820400 10800 0 +03}
-    {891126000 14400 1 +04}
-    {909270000 10800 0 +03}
-    {922575600 14400 1 +04}
-    {941324400 10800 0 +03}
-    {954025200 14400 1 +04}
-    {972774000 10800 0 +03}
-    {985474800 14400 1 +04}
-    {1004223600 10800 0 +03}
-    {1017529200 14400 1 +04}
-    {1035673200 10800 0 +03}
-    {1048978800 14400 1 +04}
-    {1067122800 10800 0 +03}
-    {1080428400 14400 1 +04}
-    {1099177200 10800 0 +03}
-    {1111878000 14400 1 +04}
-    {1130626800 10800 0 +03}
-    {1143327600 14400 1 +04}
-    {1162076400 10800 0 +03}
-    {1174777200 14400 1 +04}
-    {1193526000 10800 0 +03}
-    {1206831600 14400 1 +04}
-    {1224975600 10800 0 +03}
-    {1238281200 14400 1 +04}
-    {1256425200 10800 0 +03}
-    {1269730800 14400 1 +04}
-    {1288479600 10800 0 +03}
-    {1301180400 14400 0 +04}
-    {1414274400 10800 0 +03}
+    {701820000 10800 0 MSD}
+    {701823600 14400 1 MSD}
+    {717548400 10800 0 MSK}
+    {733273200 14400 1 MSD}
+    {748998000 10800 0 MSK}
+    {764722800 14400 1 MSD}
+    {780447600 10800 0 MSK}
+    {796172400 14400 1 MSD}
+    {811897200 10800 0 MSK}
+    {828226800 14400 1 MSD}
+    {846370800 10800 0 MSK}
+    {859676400 14400 1 MSD}
+    {877820400 10800 0 MSK}
+    {891126000 14400 1 MSD}
+    {909270000 10800 0 MSK}
+    {922575600 14400 1 MSD}
+    {941324400 10800 0 MSK}
+    {954025200 14400 1 MSD}
+    {972774000 10800 0 MSK}
+    {985474800 14400 1 MSD}
+    {1004223600 10800 0 MSK}
+    {1017529200 14400 1 MSD}
+    {1035673200 10800 0 MSK}
+    {1048978800 14400 1 MSD}
+    {1067122800 10800 0 MSK}
+    {1080428400 14400 1 MSD}
+    {1099177200 10800 0 MSK}
+    {1111878000 14400 1 MSD}
+    {1130626800 10800 0 MSK}
+    {1143327600 14400 1 MSD}
+    {1162076400 10800 0 MSK}
+    {1174777200 14400 1 MSD}
+    {1193526000 10800 0 MSK}
+    {1206831600 14400 1 MSD}
+    {1224975600 10800 0 MSK}
+    {1238281200 14400 1 MSD}
+    {1256425200 10800 0 MSK}
+    {1269730800 14400 1 MSD}
+    {1288479600 10800 0 MSK}
+    {1301180400 14400 0 MSK}
+    {1414274400 10800 0 MSK}
 }
diff --git a/library/tzdata/Europe/Volgograd b/library/tzdata/Europe/Volgograd
index 2ce2dfe..00c3cb3 100644
--- a/library/tzdata/Europe/Volgograd
+++ b/library/tzdata/Europe/Volgograd
@@ -19,55 +19,55 @@ set TZData(:Europe/Volgograd) {
     {528242400 14400 0 +04}
     {543967200 18000 1 +05}
     {559692000 14400 0 +04}
-    {575416800 10800 0 +04}
-    {575420400 14400 1 +04}
-    {591145200 10800 0 +03}
-    {606870000 14400 1 +04}
-    {622594800 10800 0 +03}
-    {638319600 14400 1 +04}
-    {654649200 10800 0 +03}
+    {575416800 10800 0 MSD}
+    {575420400 14400 1 MSD}
+    {591145200 10800 0 MSK}
+    {606870000 14400 1 MSD}
+    {622594800 10800 0 MSK}
+    {638319600 14400 1 MSD}
+    {654649200 10800 0 MSK}
     {670374000 14400 0 +04}
-    {701820000 10800 0 +04}
-    {701823600 14400 1 +04}
-    {717548400 10800 0 +03}
-    {733273200 14400 1 +04}
-    {748998000 10800 0 +03}
-    {764722800 14400 1 +04}
-    {780447600 10800 0 +03}
-    {796172400 14400 1 +04}
-    {811897200 10800 0 +03}
-    {828226800 14400 1 +04}
-    {846370800 10800 0 +03}
-    {859676400 14400 1 +04}
-    {877820400 10800 0 +03}
-    {891126000 14400 1 +04}
-    {909270000 10800 0 +03}
-    {922575600 14400 1 +04}
-    {941324400 10800 0 +03}
-    {954025200 14400 1 +04}
-    {972774000 10800 0 +03}
-    {985474800 14400 1 +04}
-    {1004223600 10800 0 +03}
-    {1017529200 14400 1 +04}
-    {1035673200 10800 0 +03}
-    {1048978800 14400 1 +04}
-    {1067122800 10800 0 +03}
-    {1080428400 14400 1 +04}
-    {1099177200 10800 0 +03}
-    {1111878000 14400 1 +04}
-    {1130626800 10800 0 +03}
-    {1143327600 14400 1 +04}
-    {1162076400 10800 0 +03}
-    {1174777200 14400 1 +04}
-    {1193526000 10800 0 +03}
-    {1206831600 14400 1 +04}
-    {1224975600 10800 0 +03}
-    {1238281200 14400 1 +04}
-    {1256425200 10800 0 +03}
-    {1269730800 14400 1 +04}
-    {1288479600 10800 0 +03}
-    {1301180400 14400 0 +04}
-    {1414274400 10800 0 +03}
+    {701820000 10800 0 MSD}
+    {701823600 14400 1 MSD}
+    {717548400 10800 0 MSK}
+    {733273200 14400 1 MSD}
+    {748998000 10800 0 MSK}
+    {764722800 14400 1 MSD}
+    {780447600 10800 0 MSK}
+    {796172400 14400 1 MSD}
+    {811897200 10800 0 MSK}
+    {828226800 14400 1 MSD}
+    {846370800 10800 0 MSK}
+    {859676400 14400 1 MSD}
+    {877820400 10800 0 MSK}
+    {891126000 14400 1 MSD}
+    {909270000 10800 0 MSK}
+    {922575600 14400 1 MSD}
+    {941324400 10800 0 MSK}
+    {954025200 14400 1 MSD}
+    {972774000 10800 0 MSK}
+    {985474800 14400 1 MSD}
+    {1004223600 10800 0 MSK}
+    {1017529200 14400 1 MSD}
+    {1035673200 10800 0 MSK}
+    {1048978800 14400 1 MSD}
+    {1067122800 10800 0 MSK}
+    {1080428400 14400 1 MSD}
+    {1099177200 10800 0 MSK}
+    {1111878000 14400 1 MSD}
+    {1130626800 10800 0 MSK}
+    {1143327600 14400 1 MSD}
+    {1162076400 10800 0 MSK}
+    {1174777200 14400 1 MSD}
+    {1193526000 10800 0 MSK}
+    {1206831600 14400 1 MSD}
+    {1224975600 10800 0 MSK}
+    {1238281200 14400 1 MSD}
+    {1256425200 10800 0 MSK}
+    {1269730800 14400 1 MSD}
+    {1288479600 10800 0 MSK}
+    {1301180400 14400 0 MSK}
+    {1414274400 10800 0 MSK}
     {1540681200 14400 0 +04}
-    {1609020000 10800 0 +03}
+    {1609020000 10800 0 MSK}
 }
diff --git a/tests/chanio.test b/tests/chanio.test
index 4ad5e3a..69a694e 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -3958,7 +3958,7 @@ test chan-io-32.3 {Tcl_Read, negative byte count} -setup {
     chan read $f -1
 } -returnCodes error -cleanup {
     chan close $f
-} -result {Expected non-negative integer but got "-1"}
+} -result {expected non-negative integer but got "-1"}
 test chan-io-32.4 {Tcl_Read, positive byte count} -body {
     set f [open $path(longfile) r]
     string length [chan read $f 1024]
diff --git a/tests/fileName.test b/tests/fileName.test
index 6f8966f..d16f86e 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -18,6 +18,7 @@ if {"::tcltest" ni [namespace children]} {
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact tcl::test [info patchlevel]]
+source [file join [file dirname [info script]] tcltests.tcl]
 
 testConstraint testsetplatform [llength [info commands testsetplatform]]
 testConstraint testtranslatefilename [llength [info commands testtranslatefilename]]
@@ -1629,6 +1630,66 @@ test fileName-20.10 {globbing for special chars} -setup {
     removeFile fileName-20.10 $s
     removeDirectory sub ~
 } -result ~/sub/fileName-20.10
+
+
+apply [list {} {
+    test fileName-6d4e9d1af5bf5b7d {
+	memory leak in SetFsPathFromAny
+
+	Runs under both a TCL_DEBUG_MEM build and a -DPURIFY build for
+	valgrind, which is useful since Valgrind provides information about the
+	error location, but [memory] doesn't.
+    } -setup {
+	makeFile {puts "In script"} script
+
+	if {[namespace which ::memory] eq {}} {
+	    set memcheckcmd [list ::apply [list script {
+		uplevel 1 $script
+		return 0
+	    } [namespace current]]]
+	} else {
+	    set memcheckcmd ::tcltests::scriptmemcheck
+	}
+    } -body {
+	{*}$memcheckcmd {
+	    set interp [interp create]
+	    interp eval $interp {
+		apply [list {} {
+		    upvar 1 f f 
+
+		    # A unique name so that no internal representation of this
+		    # literal value has been picked up from any other script
+		    # that has alredy been sourced into this interpreter.
+		    set variableUniqueInTheEntireTclCodebase a
+		    set name variableUniqueInTheEntireTclCodebase
+
+		    # give the Tcl_Obj for "var1" an internal representation of
+		    # type 'localVarNameType'.
+		    set $name
+
+		    set f [open variableUniqueInTheEntireTclCodebase w]
+			try {
+				puts $f {some data}
+			} finally {
+				close $f
+			}
+
+		    set f [open variableUniqueInTheEntireTclCodebase]
+			try {
+				read $f
+			} finally {
+				catch {file delete variableUniqueInTheEntireTclCodebase}
+				close $f
+			}
+		} [namespace current]]
+	    }
+	    interp delete $interp
+	}
+    } -result 0
+} [namespace current]]
+    
+
+
 
 # cleanup
 catch {file delete -force C:/globTest}
diff --git a/tests/interp.test b/tests/interp.test
index 20fa50a..fa263e2 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -1214,7 +1214,7 @@ test interp-20.23 {interp hide vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {1 {Permission denied: safe interpreter cannot hide commands}}
+} {1 {permission denied: safe interpreter cannot hide commands}}
 test interp-20.24 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1224,7 +1224,7 @@ test interp-20.24 {interp hide vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {1 {Permission denied: safe interpreter cannot hide commands}}
+} {1 {permission denied: safe interpreter cannot hide commands}}
 test interp-20.25 {interp hide vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1267,7 +1267,7 @@ test interp-20.28 {interp expose vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {0 {} 1 {Permission denied: safe interpreter cannot expose commands}}
+} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
 test interp-20.29 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1278,7 +1278,7 @@ test interp-20.29 {interp expose vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {0 {} 1 {Permission denied: safe interpreter cannot expose commands}}
+} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
 test interp-20.30 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1290,7 +1290,7 @@ test interp-20.30 {interp expose vs safety} {
     lappend l $msg
     interp delete a
     set l
-} {0 {} 1 {Permission denied: safe interpreter cannot expose commands}}
+} {0 {} 1 {permission denied: safe interpreter cannot expose commands}}
 test interp-20.31 {interp expose vs safety} {
     catch {interp delete a}
     interp create a -safe
@@ -1767,7 +1767,7 @@ test interp-22.5 {testing interp marktrusted} {
     catch {a eval {interp marktrusted b}} msg
     interp delete a
     set msg
-} {Permission denied: safe interpreter cannot mark trusted}
+} {permission denied: safe interpreter cannot mark trusted}
 test interp-22.6 {testing interp marktrusted} {
     catch {interp delete a}
     interp create a -safe
@@ -1775,7 +1775,7 @@ test interp-22.6 {testing interp marktrusted} {
     catch {a eval {b marktrusted}} msg
     interp delete a
     set msg
-} {Permission denied: safe interpreter cannot mark trusted}
+} {permission denied: safe interpreter cannot mark trusted}
 test interp-22.7 {testing interp marktrusted} {
     catch {interp delete a}
     interp create a -safe
@@ -3004,7 +3004,7 @@ test interp-29.6.8 {safe interpreter recursion limit} {
     set n [catch {child eval {interp recursionlimit {} 42}} msg]
     interp delete child
     list $n $msg
-} {1 {Permission denied: safe interpreters cannot change recursion limit}}
+} {1 {permission denied: safe interpreters cannot change recursion limit}}
 test interp-29.6.9 {safe interpreter recursion limit} {
     interp create child -safe
     set result [
@@ -3018,7 +3018,7 @@ test interp-29.6.9 {safe interpreter recursion limit} {
     ]
     interp delete child
     set result
-} {1 {Permission denied: safe interpreters cannot change recursion limit}}
+} {1 {permission denied: safe interpreters cannot change recursion limit}}
 test interp-29.6.10 {safe interpreter recursion limit} {
     interp create child -safe
     set result [
@@ -3032,7 +3032,7 @@ test interp-29.6.10 {safe interpreter recursion limit} {
     ]
     interp delete child
     set result
-} {1 {Permission denied: safe interpreters cannot change recursion limit}}
+} {1 {permission denied: safe interpreters cannot change recursion limit}}
 
 
 #    # Deep recursion (into interps when the regular one fails):
diff --git a/tests/io.test b/tests/io.test
index b9426b5..ea0f7a2 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -4211,7 +4211,7 @@ test io-32.3 {Tcl_Read, negative byte count} {
     set l [list [catch {read $f -1} msg] $msg]
     close $f
     set l
-} {1 {Expected non-negative integer but got "-1"}}
+} {1 {expected non-negative integer but got "-1"}}
 test io-32.4 {Tcl_Read, positive byte count} {
     set f [open $path(longfile) r]
     set x [read $f 1024]
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 6054cc9..483781e 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -138,7 +138,7 @@ test iocmd-4.8 {read command with incorrect combination of arguments} {
 } {1 {wrong # args: should be "read channelId ?numChars?" or "read ?-nonewline? channelId"} {TCL WRONGARGS}}
 test iocmd-4.9 {read command} {
     list [catch {read stdin foo} msg] $msg $::errorCode
-} {1 {Expected non-negative integer but got "foo"} {TCL VALUE NUMBER}}
+} {1 {expected non-negative integer but got "foo"} {TCL VALUE NUMBER}}
 test iocmd-4.10 {read command} {
     list [catch {read file107} msg] $msg $::errorCode
 } {1 {can not find channel named "file107"} {TCL LOOKUP CHANNEL file107}}
@@ -156,7 +156,7 @@ test iocmd-4.12 {read command} -setup {
     read $f 12z
 } -cleanup {
     close $f
-} -result {Expected non-negative integer but got "12z"} -errorCode {TCL VALUE NUMBER}
+} -result {expected non-negative integer but got "12z"} -errorCode {TCL VALUE NUMBER}
 
 test iocmd-5.1 {seek command} -returnCodes error -body {
     seek
diff --git a/tests/socket.test b/tests/socket.test
index 5e6ba66..2509bc0 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -645,7 +645,7 @@ test socket_$af-2.9 {socket conflict} -constraints [list socket supported_$af st
     close $f
 } -returnCodes error -cleanup {
     close $s
-} -match glob -result {couldn't open socket: Address in use*}
+} -match glob -result {couldn't open socket: Address already in use*}
 test socket_$af-2.10 {close on accept, accepted socket lives} -setup {
     set done 0
     set timer [after 20000 "set done timed_out"]
@@ -802,7 +802,7 @@ test socket_$af-3.1 {socket conflict} -constraints [list socket supported_$af st
 } -cleanup {
     puts $f bye
     close $f
-} -returnCodes error -result {couldn't open socket: Address in use}
+} -returnCodes error -result {couldn't open socket: Address already in use}
 test socket_$af-3.2 {server with several clients} -setup {
     file delete $path(script)
     set f [open $path(script) w]
@@ -1397,7 +1397,7 @@ test socket_$af-11.6 {socket conflict} -setup {
     list [getPort $s2] [close $s2]
 } -cleanup {
     close $s1
-} -returnCodes error -result {couldn't open socket: Address in use}
+} -returnCodes error -result {couldn't open socket: Address already in use}
 test socket_$af-11.7 {server with several clients} -setup {
     set port [sendCommand {
 	set server [socket -server accept 0]
diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl
index a2251bf..61366a4 100644
--- a/tests/tcltests.tcl
+++ b/tests/tcltests.tcl
@@ -34,6 +34,18 @@ namespace eval ::tcltests {
     }
 
 
+    # Stolen from dict.test
+    proc scriptmemcheck script {
+	set end [lindex [split [memory info] \n] 3 3]
+	for {set i 0} {$i < 5} {incr i} {
+	    uplevel 1 $script
+	    set tmp $end
+	    set end [lindex [split [memory info] \n] 3 3]
+	}
+	expr {$end - $tmp}
+    }
+
+
     proc tempdir_alternate {} {
 	close [file tempfile tempfile]
 	set tmpdir [file dirname $tempfile]