Updated Tcl/Tk

git-svn-id: svn://tug.org/texlive/trunk@58056 c570f23f-e606-0410-a88d-b1316a301751
author: Siep Kroonenberg <siepo@cybercomm.nl> 2021-03-02 16:29:37 +0000
committer: Siep Kroonenberg <siepo@cybercomm.nl> 2021-03-02 16:29:37 +0000
commit: 616f8e79872ffbec55d54a3dd50a5e7c12df531e (patch)
tree: a161afe04b7f6fe85d431035954f953ebbfafc04
parent: 9f5b17da86ecb1e3dc760d0cf781062ba16460a7 (diff)
173 files changed, 2589 insertions, 2335 deletions
diff --git a/Master/tlpkg/tltcl/bin/tcl86.dll b/Master/tlpkg/tltcl/bin/tcl86.dll
index 27930d2eb10..12279f62b81 100755
--- a/Master/tlpkg/tltcl/bin/tcl86.dll
+++ b/Master/tlpkg/tltcl/bin/tcl86.dll
diff --git a/Master/tlpkg/tltcl/bin/tclsh.exe b/Master/tlpkg/tltcl/bin/tclsh.exe
index e09ed7d2c21..0de88c7ddaa 100755
--- a/Master/tlpkg/tltcl/bin/tclsh.exe
+++ b/Master/tlpkg/tltcl/bin/tclsh.exe
diff --git a/Master/tlpkg/tltcl/bin/tclsh86.exe b/Master/tlpkg/tltcl/bin/tclsh86.exe
new file mode 100755
index 00000000000..0de88c7ddaa
--- /dev/null
+++ b/Master/tlpkg/tltcl/bin/tclsh86.exe
diff --git a/Master/tlpkg/tltcl/bin/tk86.dll b/Master/tlpkg/tltcl/bin/tk86.dll
index da1bc826960..d5f1c0880fe 100755
--- a/Master/tlpkg/tltcl/bin/tk86.dll
+++ b/Master/tlpkg/tltcl/bin/tk86.dll
diff --git a/Master/tlpkg/tltcl/bin/wish.exe b/Master/tlpkg/tltcl/bin/wish.exe
index 5ef0a1c2179..a62d77610be 100755
--- a/Master/tlpkg/tltcl/bin/wish.exe
+++ b/Master/tlpkg/tltcl/bin/wish.exe
diff --git a/Master/tlpkg/tltcl/bin/wish86.exe b/Master/tlpkg/tltcl/bin/wish86.exe
new file mode 100755
index 00000000000..a62d77610be
--- /dev/null
+++ b/Master/tlpkg/tltcl/bin/wish86.exe
diff --git a/Master/tlpkg/tltcl/bin/zlib1.dll b/Master/tlpkg/tltcl/bin/zlib1.dll
index d7d29a3bf38..bb3d4244a95 100755
--- a/Master/tlpkg/tltcl/bin/zlib1.dll
+++ b/Master/tlpkg/tltcl/bin/zlib1.dll
diff --git a/Master/tlpkg/tltcl/lib/dde1.4/libtcldde14.a b/Master/tlpkg/tltcl/lib/dde1.4/libtcldde14.dll.a
index 1d8277753c7..6544a9b1baf 100644
--- a/Master/tlpkg/tltcl/lib/dde1.4/libtcldde14.a
+++ b/Master/tlpkg/tltcl/lib/dde1.4/libtcldde14.dll.a
diff --git a/Master/tlpkg/tltcl/lib/dde1.4/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/dde1.4/pkgIndex.tcl
index f6a479dafce..1ca9c5a3cb4 100644
--- a/Master/tlpkg/tltcl/lib/dde1.4/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/dde1.4/pkgIndex.tcl
@@ -1,7 +1,7 @@
 if {![package vsatisfies [package provide Tcl] 8.5]} return
 if {[info sharedlibextension] != ".dll"} return
 if {[::tcl::pkgconfig get debug]} {
-    package ifneeded dde 1.4.2 [list load [file join $dir tcldde14g.dll] dde]
+    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14g.dll] Dde]
 } else {
-    package ifneeded dde 1.4.2 [list load [file join $dir tcldde14.dll] dde]
+    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] Dde]
 }
diff --git a/Master/tlpkg/tltcl/lib/dde1.4/tcldde14.dll b/Master/tlpkg/tltcl/lib/dde1.4/tcldde14.dll
index 1d039ece49c..c26c0f837d3 100755
--- a/Master/tlpkg/tltcl/lib/dde1.4/tcldde14.dll
+++ b/Master/tlpkg/tltcl/lib/dde1.4/tcldde14.dll
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/itcl420.dll b/Master/tlpkg/tltcl/lib/itcl4.2.0/itcl420.dll
deleted file mode 100755
index f6085bd3b01..00000000000
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/itcl420.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/libitclstub420.a b/Master/tlpkg/tltcl/lib/itcl4.2.0/libitclstub420.a
deleted file mode 100644
index 495efd70b61..00000000000
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/libitclstub420.a
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/itcl.tcl b/Master/tlpkg/tltcl/lib/itcl4.2.1/itcl.tcl
index 15ca2200f4d..15ca2200f4d 100644
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/itcl.tcl
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/itcl.tcl
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.1/itcl421.dll b/Master/tlpkg/tltcl/lib/itcl4.2.1/itcl421.dll
new file mode 100644
index 00000000000..619006997ae
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/itcl421.dll
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/itclConfig.sh b/Master/tlpkg/tltcl/lib/itcl4.2.1/itclConfig.sh
index 33e56703a45..1616bf3702c 100644
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/itclConfig.sh
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/itclConfig.sh
@@ -12,56 +12,56 @@
 # The information in this file is specific to a single platform.
 
 # Itcl's version number.
-itcl_VERSION='4.2.0'
-ITCL_VERSION='4.2.0'
+itcl_VERSION='4.2.1'
+ITCL_VERSION='4.2.1'
 
 # The name of the Itcl library (may be either a .a file or a shared library):
-itcl_LIB_FILE=itcl420.dll
-ITCL_LIB_FILE=itcl420.dll
+itcl_LIB_FILE=itcl421.dll
+ITCL_LIB_FILE=itcl421.dll
 
 # String to pass to linker to pick up the Itcl library from its
 # build directory.
-itcl_BUILD_LIB_SPEC='-L/tmp/siepo/tcl8.6.10/win/pkgs/itcl4.2.0 -litcl420'
-ITCL_BUILD_LIB_SPEC='-L/tmp/siepo/tcl8.6.10/win/pkgs/itcl4.2.0 -litcl420'
+itcl_BUILD_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/itcl4.2.1 -litcl421'
+ITCL_BUILD_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/itcl4.2.1 -litcl421'
 
 # String to pass to linker to pick up the Itcl library from its
 # installed directory.
-itcl_LIB_SPEC='-L/tmp/siepo/tcltk/lib/itcl4.2.0 -litcl420'
-ITCL_LIB_SPEC='-L/tmp/siepo/tcltk/lib/itcl4.2.0 -litcl420'
+itcl_LIB_SPEC='-L/home/siepo/tltcl/lib/itcl4.2.1 -litcl421'
+ITCL_LIB_SPEC='-L/home/siepo/tltcl/lib/itcl4.2.1 -litcl421'
 
 # The name of the Itcl stub library (a .a file):
-itcl_STUB_LIB_FILE=libitclstub420.a
-ITCL_STUB_LIB_FILE=libitclstub420.a
+itcl_STUB_LIB_FILE=libitclstub421.a
+ITCL_STUB_LIB_FILE=libitclstub421.a
 
 # String to pass to linker to pick up the Itcl stub library from its
 # build directory.
-itcl_BUILD_STUB_LIB_SPEC='-L/tmp/siepo/tcl8.6.10/win/pkgs/itcl4.2.0 -litclstub420'
-ITCL_BUILD_STUB_LIB_SPEC='-L/tmp/siepo/tcl8.6.10/win/pkgs/itcl4.2.0 -litclstub420'
+itcl_BUILD_STUB_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/itcl4.2.1 -litclstub421'
+ITCL_BUILD_STUB_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/itcl4.2.1 -litclstub421'
 
 # String to pass to linker to pick up the Itcl stub library from its
 # installed directory.
-itcl_STUB_LIB_SPEC='-L/tmp/siepo/tcltk/lib/itcl4.2.0 -litclstub420'
-ITCL_STUB_LIB_SPEC='-L/tmp/siepo/tcltk/lib/itcl4.2.0 -litclstub420'
+itcl_STUB_LIB_SPEC='-L/home/siepo/tltcl/lib/itcl4.2.1 -litclstub421'
+ITCL_STUB_LIB_SPEC='-L/home/siepo/tltcl/lib/itcl4.2.1 -litclstub421'
 
 # String to pass to linker to pick up the Itcl stub library from its
 # build directory.
-itcl_BUILD_STUB_LIB_PATH='/tmp/siepo/tcl8.6.10/win/pkgs/itcl4.2.0/libitclstub420.a'
-ITCL_BUILD_STUB_LIB_PATH='/tmp/siepo/tcl8.6.10/win/pkgs/itcl4.2.0/libitclstub420.a'
+itcl_BUILD_STUB_LIB_PATH='/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/itcl4.2.1/libitclstub421.a'
+ITCL_BUILD_STUB_LIB_PATH='/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/itcl4.2.1/libitclstub421.a'
 
 # String to pass to linker to pick up the Itcl stub library from its
 # installed directory.
-itcl_STUB_LIB_PATH='/tmp/siepo/tcltk/lib/itcl4.2.0/libitclstub420.a'
-ITCL_STUB_LIB_PATH='/tmp/siepo/tcltk/lib/itcl4.2.0/libitclstub420.a'
+itcl_STUB_LIB_PATH='/home/siepo/tltcl/lib/itcl4.2.1/libitclstub421.a'
+ITCL_STUB_LIB_PATH='/home/siepo/tltcl/lib/itcl4.2.1/libitclstub421.a'
 
 # Location of the top-level source directories from which [incr Tcl]
 # was built.  This is the directory that contains generic, unix, etc.
 # If [incr Tcl] was compiled in a different place than the directory
 # containing the source files, this points to the location of the sources,
 # not the location where [incr Tcl] was compiled.
-itcl_SRC_DIR='/tmp/siepo/tcl8.6.10/pkgs/itcl4.2.0'
-ITCL_SRC_DIR='/tmp/siepo/tcl8.6.10/pkgs/itcl4.2.0'
+itcl_SRC_DIR='/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/itcl4.2.1'
+ITCL_SRC_DIR='/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/itcl4.2.1'
 
 # String to pass to the compiler so that an extension can
 # find installed Itcl headers.
-itcl_INCLUDE_SPEC='-I/tmp/siepo/tcl8.6.10/pkgs/itcl4.2.0/generic'
-ITCL_INCLUDE_SPEC='-I/tmp/siepo/tcl8.6.10/pkgs/itcl4.2.0/generic'
+itcl_INCLUDE_SPEC='-I/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/itcl4.2.1/generic'
+ITCL_INCLUDE_SPEC='-I/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/itcl4.2.1/generic'
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/itclHullCmds.tcl b/Master/tlpkg/tltcl/lib/itcl4.2.1/itclHullCmds.tcl
index 282041187c6..282041187c6 100644
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/itclHullCmds.tcl
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/itclHullCmds.tcl
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/itclWidget.tcl b/Master/tlpkg/tltcl/lib/itcl4.2.1/itclWidget.tcl
index 5fcda510e09..5fcda510e09 100644
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/itclWidget.tcl
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/itclWidget.tcl
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.1/libitclstub421.a b/Master/tlpkg/tltcl/lib/itcl4.2.1/libitclstub421.a
new file mode 100644
index 00000000000..c070af8e7e7
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/libitclstub421.a
diff --git a/Master/tlpkg/tltcl/lib/itcl4.2.0/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/itcl4.2.1/pkgIndex.tcl
index b8fb0e54539..4526cae8a10 100644
--- a/Master/tlpkg/tltcl/lib/itcl4.2.0/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/itcl4.2.1/pkgIndex.tcl
@@ -1,7 +1,7 @@
 # Tcl package index file, version 1.0
 #
 # Do NOT try this command
-# 
+#
 #   if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
 #
 # as a way to accept working with all of Tcl 8.6, Tcl 8.X, X>6, and
@@ -10,12 +10,12 @@
 # There is no libitcl.so that will [load] into both Tcl 8 and Tcl 9.
 # The indexed libitcl.so was built to [load] into one or the other.
 # Thus the pkgIndex.tcl should only accept the version of Tcl for which
-# the indexed itcl420.dll was built.
+# the indexed itcl421.dll was built.
 #
 # More work replacing the literal "8.6" below with the proper value substituted
 # by configure is the right way forward.
 
 if {![package vsatisfies [package provide Tcl] 8.6]} {return}
 
-package ifneeded itcl 4.2.0 [list load [file join $dir "itcl420.dll"] itcl]
-package ifneeded Itcl 4.2.0 [list load [file join $dir "itcl420.dll"] itcl]
+package ifneeded itcl 4.2.1 [list load [file join $dir "itcl421.dll"] Itcl]
+package ifneeded Itcl 4.2.1 [list load [file join $dir "itcl421.dll"] Itcl]
diff --git a/Master/tlpkg/tltcl/lib/libtcl86.a b/Master/tlpkg/tltcl/lib/libtcl86.dll.a
index 363fd12f010..1da92dcae19 100644
--- a/Master/tlpkg/tltcl/lib/libtcl86.a
+++ b/Master/tlpkg/tltcl/lib/libtcl86.dll.a
diff --git a/Master/tlpkg/tltcl/lib/libtclstub86.a b/Master/tlpkg/tltcl/lib/libtclstub86.a
index 66aebf61241..34081332797 100644
--- a/Master/tlpkg/tltcl/lib/libtclstub86.a
+++ b/Master/tlpkg/tltcl/lib/libtclstub86.a
diff --git a/Master/tlpkg/tltcl/lib/libtk86.a b/Master/tlpkg/tltcl/lib/libtk86.dll.a
index 6234ea16a3e..c92ae9495a7 100644
--- a/Master/tlpkg/tltcl/lib/libtk86.a
+++ b/Master/tlpkg/tltcl/lib/libtk86.dll.a
diff --git a/Master/tlpkg/tltcl/lib/libtkstub86.a b/Master/tlpkg/tltcl/lib/libtkstub86.a
index c00fba7f34c..201e91289be 100644
--- a/Master/tlpkg/tltcl/lib/libtkstub86.a
+++ b/Master/tlpkg/tltcl/lib/libtkstub86.a
diff --git a/Master/tlpkg/tltcl/lib/reg1.3/libtclreg13.a b/Master/tlpkg/tltcl/lib/reg1.3/libtclreg13.dll.a
index 59ce7cc40c8..05a35a0e937 100644
--- a/Master/tlpkg/tltcl/lib/reg1.3/libtclreg13.a
+++ b/Master/tlpkg/tltcl/lib/reg1.3/libtclreg13.dll.a
diff --git a/Master/tlpkg/tltcl/lib/reg1.3/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/reg1.3/pkgIndex.tcl
index 219e41fe92d..6603e3ef13d 100755
--- a/Master/tlpkg/tltcl/lib/reg1.3/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/reg1.3/pkgIndex.tcl
@@ -1,9 +1,9 @@
 if {![package vsatisfies [package provide Tcl] 8.5]} return
 if {[info sharedlibextension] != ".dll"} return
 if {[::tcl::pkgconfig get debug]} {
-    package ifneeded registry 1.3.4 \
-            [list load [file join $dir tclreg13g.dll] registry]
+    package ifneeded registry 1.3.5 \
+            [list load [file join $dir tclreg13g.dll] Registry]
 } else {
-    package ifneeded registry 1.3.4 \
-            [list load [file join $dir tclreg13.dll] registry]
+    package ifneeded registry 1.3.5 \
+            [list load [file join $dir tclreg13.dll] Registry]
 }
diff --git a/Master/tlpkg/tltcl/lib/reg1.3/tclreg13.dll b/Master/tlpkg/tltcl/lib/reg1.3/tclreg13.dll
index 727f314eb50..7aa833c28d3 100755
--- a/Master/tlpkg/tltcl/lib/reg1.3/tclreg13.dll
+++ b/Master/tlpkg/tltcl/lib/reg1.3/tclreg13.dll
diff --git a/Master/tlpkg/tltcl/lib/sqlite3.30.1.2/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/sqlite3.30.1.2/pkgIndex.tcl
deleted file mode 100644
index 50cfadb8eb1..00000000000
--- a/Master/tlpkg/tltcl/lib/sqlite3.30.1.2/pkgIndex.tcl
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Tcl package index file
-#
-# Note sqlite*3* init specifically
-#
-package ifneeded sqlite3 3.30.1.2 \
-    [list load [file join $dir sqlite33012.dll] Sqlite3]
diff --git a/Master/tlpkg/tltcl/lib/sqlite3.30.1.2/sqlite33012.dll b/Master/tlpkg/tltcl/lib/sqlite3.30.1.2/sqlite33012.dll
deleted file mode 100755
index 1129cd7d6dd..00000000000
--- a/Master/tlpkg/tltcl/lib/sqlite3.30.1.2/sqlite33012.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/sqlite3.34.0/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/sqlite3.34.0/pkgIndex.tcl
new file mode 100644
index 00000000000..45d63aea331
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/sqlite3.34.0/pkgIndex.tcl
@@ -0,0 +1,7 @@
+#
+# Tcl package index file
+#
+# Note sqlite*3* init specifically
+#
+package ifneeded sqlite3 3.34.0 \
+    [list load [file join $dir sqlite3340.dll] Sqlite3]
diff --git a/Master/tlpkg/tltcl/lib/sqlite3.34.0/sqlite3340.dll b/Master/tlpkg/tltcl/lib/sqlite3.34.0/sqlite3340.dll
new file mode 100755
index 00000000000..e9caed5dea7
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/sqlite3.34.0/sqlite3340.dll
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/auto.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/auto.tcl
index a7a8979e54d..64c5bc7297b 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/auto.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/auto.tcl
@@ -240,6 +240,7 @@ proc auto_mkindex_old {dir args} {
 	set f ""
 	set error [catch {
 	    set f [open $file]
+	    fconfigure $f -eofchar \032
 	    while {[gets $f line] >= 0} {
 		if {[regexp {^proc[ 	]+([^ 	]*)} $line match procName]} {
 		    set procName [lindex [auto_qualify $procName "::"] 0]
@@ -350,6 +351,7 @@ proc auto_mkindex_parser::mkindex {file} {
     set scriptFile $file
 
     set fid [open $file]
+    fconfigure $fid -eofchar \032
     set contents [read $fid]
     close $fid
 
@@ -376,10 +378,10 @@ proc auto_mkindex_parser::mkindex {file} {
 
 # auto_mkindex_parser::hook command
 #
-# Registers a Tcl command to evaluate when initializing the slave interpreter
-# used by the mkindex parser.  The command is evaluated in the master
+# Registers a Tcl command to evaluate when initializing the child interpreter
+# used by the mkindex parser.  The command is evaluated in the parent
 # interpreter, and can use the variable auto_mkindex_parser::parser to get to
-# the slave
+# the child
 
 proc auto_mkindex_parser::hook {cmd} {
     variable initCommands
@@ -389,14 +391,14 @@ proc auto_mkindex_parser::hook {cmd} {
 
 # auto_mkindex_parser::slavehook command
 #
-# Registers a Tcl command to evaluate when initializing the slave interpreter
-# used by the mkindex parser.  The command is evaluated in the slave
+# Registers a Tcl command to evaluate when initializing the child interpreter
+# used by the mkindex parser.  The command is evaluated in the child
 # interpreter.
 
 proc auto_mkindex_parser::slavehook {cmd} {
     variable initCommands
 
-    # The $parser variable is defined to be the name of the slave interpreter
+    # The $parser variable is defined to be the name of the child interpreter
     # when this command is used later.
 
     lappend initCommands "\$parser eval [list $cmd]"
@@ -550,7 +552,7 @@ auto_mkindex_parser::command proc {name args} {
 
 # Conditionally add support for Tcl byte code files.  There are some tricky
 # details here.  First, we need to get the tbcload library initialized in the
-# current interpreter.  We cannot load tbcload into the slave until we have
+# current interpreter.  We cannot load tbcload into the child until we have
 # done so because it needs access to the tcl_patchLevel variable.  Second,
 # because the package index file may defer loading the library until we invoke
 # a command, we need to explicitly invoke auto_load to force it to be loaded.
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/clock.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/clock.tcl
index 8e4b65759c5..273b5345c72 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/clock.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/clock.tcl
@@ -9,7 +9,7 @@
 #
 #----------------------------------------------------------------------
 #
-# Copyright (c) 2004,2005,2006,2007 by Kevin B. Kenny
+# Copyright (c) 2004-2007 Kevin B. Kenny
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
@@ -3304,7 +3304,7 @@ proc ::tcl::clock::LoadTimeZoneFile { fileName } {
 	return
     }
 
-    # Since an unsafe interp uses the [clock] command in the master, this code
+    # Since an unsafe interp uses the [clock] command in the parent, this code
     # is security sensitive.  Make sure that the path name cannot escape the
     # given directory.
 
@@ -3344,7 +3344,7 @@ proc ::tcl::clock::LoadTimeZoneFile { fileName } {
 proc ::tcl::clock::LoadZoneinfoFile { fileName } {
     variable ZoneinfoPaths
 
-    # Since an unsafe interp uses the [clock] command in the master, this code
+    # Since an unsafe interp uses the [clock] command in the parent, this code
     # is security sensitive.  Make sure that the path name cannot escape the
     # given directory.
 
@@ -3452,7 +3452,7 @@ proc ::tcl::clock::ReadZoneinfoFile {fileName fname} {
     set times [linsert $times 0 $MINWIDE]
     set codes {}
     foreach c $tempCodes {
-	lappend codes [expr { $c & 0xff }]
+	lappend codes [expr { $c & 0xFF }]
     }
     set codes [linsert $codes 0 0]
 
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/encoding/tis-620.enc b/Master/tlpkg/tltcl/lib/tcl8.6/encoding/tis-620.enc
index c233be5dada..2e9142a4b23 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/encoding/tis-620.enc
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/encoding/tis-620.enc
@@ -17,4 +17,4 @@ S
 0E200E210E220E230E240E250E260E270E280E290E2A0E2B0E2C0E2D0E2E0E2F
 0E300E310E320E330E340E350E360E370E380E390E3A00000000000000000E3F
 0E400E410E420E430E440E450E460E470E480E490E4A0E4B0E4C0E4D0E4E0E4F
-0E500E510E520E530E540E550E560E570E580E590E5A0E5B0000000000000000
-\ No newline at end of file
+0E500E510E520E530E540E550E560E570E580E590E5A0E5B0000000000000000
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/init.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/init.tcl
index 5cda0d95744..1bfca4c6da8 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/init.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/init.tcl
@@ -6,7 +6,7 @@
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 Scriptics Corporation.
-# Copyright (c) 2004 by Kevin B. Kenny.  All rights reserved.
+# Copyright (c) 2004 Kevin B. Kenny.  All rights reserved.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -16,7 +16,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.6.10
+package require -exact Tcl 8.6.11
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
@@ -37,41 +37,46 @@ package require -exact Tcl 8.6.10
 # tcl_pkgPath, which is set by the platform-specific initialization routines
 #	On UNIX it is compiled in
 #       On Windows, it is not used
+#
+# (Ticket 41c9857bdd) In a safe interpreter, this file does not set
+# ::auto_path (other than to {} if it is undefined). The caller, typically
+# a Safe Base command, is responsible for setting ::auto_path.
 
 if {![info exists auto_path]} {
-    if {[info exists env(TCLLIBPATH)]} {
+    if {[info exists env(TCLLIBPATH)] && (![interp issafe])} {
 	set auto_path $env(TCLLIBPATH)
     } else {
 	set auto_path ""
     }
 }
 namespace eval tcl {
-    variable Dir
-    foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
-	if {$Dir ni $::auto_path} {
-	    lappend ::auto_path $Dir
-	}
-    }
-    set Dir [file join [file dirname [file dirname \
-	    [info nameofexecutable]]] lib]
-    if {$Dir ni $::auto_path} {
-	lappend ::auto_path $Dir
-    }
-    catch {
-	foreach Dir $::tcl_pkgPath {
+    if {![interp issafe]} {
+	variable Dir
+	foreach Dir [list $::tcl_library [file dirname $::tcl_library]] {
 	    if {$Dir ni $::auto_path} {
 		lappend ::auto_path $Dir
 	    }
 	}
-    }
+	set Dir [file join [file dirname [file dirname \
+		[info nameofexecutable]]] lib]
+	if {$Dir ni $::auto_path} {
+	    lappend ::auto_path $Dir
+	}
+	if {[info exists ::tcl_pkgPath]} { catch {
+	    foreach Dir $::tcl_pkgPath {
+		if {$Dir ni $::auto_path} {
+		    lappend ::auto_path $Dir
+		}
+	    }
+	}}
 
-    if {![interp issafe]} {
-        variable Path [encoding dirs]
-        set Dir [file join $::tcl_library encoding]
-        if {$Dir ni $Path} {
+	variable Path [encoding dirs]
+	set Dir [file join $::tcl_library encoding]
+	if {$Dir ni $Path} {
 	    lappend Path $Dir
 	    encoding dirs $Path
-        }
+	}
+	unset Dir Path
     }
 
     # TIP #255 min and max functions
@@ -79,7 +84,7 @@ namespace eval tcl {
 	proc min {args} {
 	    if {![llength $args]} {
 		return -code error \
-		    "too few arguments to math function \"min\""
+		    "not enough arguments to math function \"min\""
 	    }
 	    set val Inf
 	    foreach arg $args {
@@ -95,7 +100,7 @@ namespace eval tcl {
 	proc max {args} {
 	    if {![llength $args]} {
 		return -code error \
-		    "too few arguments to math function \"max\""
+		    "not enough arguments to math function \"max\""
 	    }
 	    set val -Inf
 	    foreach arg $args {
@@ -308,7 +313,7 @@ proc unknown args {
 		set errInfo [string range $errInfo 0 $last-1]
 		set tail "\"$cinfo\""
 		set last [string last $tail $errInfo]
-		if {$last + [string length $tail] != [string length $errInfo]} {
+		if {$last < 0 || $last + [string length $tail] != [string length $errInfo]} {
 		    return -code error -errorcode $errCode \
 			    -errorinfo $errInfo $msg
 		}
@@ -489,6 +494,7 @@ proc auto_load_index {} {
 	    continue
 	} else {
 	    set error [catch {
+		fconfigure $f -eofchar \032
 		set id [gets $f]
 		if {$id eq "# Tcl autoload index file, version 2.0"} {
 		    eval [read $f]
@@ -792,7 +798,7 @@ proc tcl::CopyDirectory {action src dest} {
 	    }
 	}
     } else {
-	if {[string first $nsrc $ndest] != -1} {
+	if {[string first $nsrc $ndest] >= 0} {
 	    set srclen [expr {[llength [file split $nsrc]] - 1}]
 	    set ndest [lindex [file split $ndest] $srclen]
 	    if {$ndest eq [file tail $nsrc]} {
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/optparse.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/optparse.tcl
index 869a2b652f5..163937942ad 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/optparse.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/optparse.tcl
@@ -8,10 +8,10 @@
 #	on it.  If your code does rely on this package you
 #	may directly incorporate this code into your application.
 
-package require Tcl 8.2
+package require Tcl 8.5-
 # When this version number changes, update the pkgIndex.tcl file
 # and the install directory in the Makefiles.
-package provide opt 0.4.6
+package provide opt 0.4.8
 
 namespace eval ::tcl {
 
@@ -44,8 +44,8 @@ namespace eval ::tcl {
             {-intflag      7}
             {-weirdflag                    "help string"}
             {-noStatics                    "Not ok to load static packages"}
-            {-nestedloading1 true           "OK to load into nested slaves"}
-            {-nestedloading2 -boolean true "OK to load into nested slaves"}
+            {-nestedloading1 true           "OK to load into nested children"}
+            {-nestedloading2 -boolean true "OK to load into nested children"}
             {-libsOK        -choice {Tk SybTcl}
 		                      "List of packages that can be loaded"}
             {-precision     -int 12        "Number of digits of precision"}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/pkgIndex.tcl
index 107d4c6afe0..23e118cc509 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/opt0.4/pkgIndex.tcl
@@ -8,5 +8,5 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-if {![package vsatisfies [package provide Tcl] 8.2]} {return}
-package ifneeded opt 0.4.6 [list source [file join $dir optparse.tcl]]
+if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
+package ifneeded opt 0.4.8 [list source [file join $dir optparse.tcl]]
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/package.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/package.tcl
index 44e3b28f834..4a7334679f1 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/package.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/package.tcl
@@ -237,7 +237,7 @@ proc pkg_mkIndex {args} {
 	$c eval [list set ::tcl::file $file]
 	$c eval [list set ::tcl::direct $direct]
 
-	# Download needed procedures into the slave because we've just deleted
+	# Download needed procedures into the child because we've just deleted
 	# the unknown procedure.  This doesn't handle procedures with default
 	# arguments.
 
@@ -479,9 +479,12 @@ proc tclPkgUnknown {name args} {
 	}
 	set tclSeenPath($dir) 1
 
-	# we can't use glob in safe interps, so enclose the following in a
-	# catch statement, where we get the pkgIndex files out of the
-	# subdirectories
+	# Get the pkgIndex.tcl files in subdirectories of auto_path directories.
+	# - Safe Base interpreters have a restricted "glob" command that
+	#   works in this case.
+	# - The "catch" was essential when there was no safe glob and every
+	#   call in a safe interp failed; it is retained only for corner
+	#   cases in which the eventual call to glob returns an error.
 	catch {
 	    foreach file [glob -directory $dir -join -nocomplain \
 		    * pkgIndex.tcl] {
@@ -585,6 +588,7 @@ proc tcl::MacOSXPkgUnknown {original name args} {
 	set tclSeenPath($dir) 1
 
 	# get the pkgIndex files out of the subdirectories
+	# Safe interpreters do not use tcl::MacOSXPkgUnknown - see init.tcl.
 	foreach file [glob -directory $dir -join -nocomplain \
 		* Resources Scripts pkgIndex.tcl] {
 	    set dir [file dirname $file]
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/safe.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/safe.tcl
index ea6391d4764..b9dd18dcbe5 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/safe.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/safe.tcl
@@ -1,9 +1,9 @@
 # safe.tcl --
 #
 # This file provide a safe loading/sourcing mechanism for safe interpreters.
-# It implements a virtual path mecanism to hide the real pathnames from the
-# slave. It runs in a master interpreter and sets up data structure and
-# aliases that will be invoked when used from a slave interpreter.
+# It implements a virtual path mechanism to hide the real pathnames from the
+# child. It runs in a parent interpreter and sets up data structure and
+# aliases that will be invoked when used from a child interpreter.
 #
 # See the safe.n man page for details.
 #
@@ -20,7 +20,7 @@
 #
 
 # Needed utilities package
-package require opt 0.4.1
+package require opt 0.4.8
 
 # Create the safe namespace
 namespace eval ::safe {
@@ -79,6 +79,7 @@ proc ::safe::InterpNested {} {
 # Interface/entry point function and front end for "Create"
 proc ::safe::interpCreate {args} {
     set Args [::tcl::OptKeyParse ::safe::interpCreate $args]
+    RejectExcessColons $slave
     InterpCreate $slave $accessPath \
 	[InterpStatics] [InterpNested] $deleteHook
 }
@@ -88,16 +89,17 @@ proc ::safe::interpInit {args} {
     if {![::interp exists $slave]} {
 	return -code error "\"$slave\" is not an interpreter"
     }
+    RejectExcessColons $slave
     InterpInit $slave $accessPath \
 	[InterpStatics] [InterpNested] $deleteHook
 }
 
-# Check that the given slave is "one of us"
-proc ::safe::CheckInterp {slave} {
-    namespace upvar ::safe S$slave state
-    if {![info exists state] || ![::interp exists $slave]} {
+# Check that the given child is "one of us"
+proc ::safe::CheckInterp {child} {
+    namespace upvar ::safe [VarName $child] state
+    if {![info exists state] || ![::interp exists $child]} {
 	return -code error \
-	    "\"$slave\" is not an interpreter managed by ::safe::"
+	    "\"$child\" is not an interpreter managed by ::safe::"
     }
 }
 
@@ -119,11 +121,11 @@ proc ::safe::interpConfigure {args} {
 	1 {
 	    # If we have exactly 1 argument the semantic is to return all
 	    # the current configuration. We still call OptKeyParse though
-	    # we know that "slave" is our given argument because it also
+	    # we know that "child" is our given argument because it also
 	    # checks for the "-help" option.
 	    set Args [::tcl::OptKeyParse ::safe::interpIC $args]
 	    CheckInterp $slave
-	    namespace upvar ::safe S$slave state
+	    namespace upvar ::safe [VarName $slave] state
 
 	    return [join [list \
 		[list -accessPath $state(access_path)] \
@@ -146,7 +148,7 @@ proc ::safe::interpConfigure {args} {
 		return -code error [::tcl::OptFlagUsage $desc $arg]
 	    }
 	    CheckInterp $slave
-	    namespace upvar ::safe S$slave state
+	    namespace upvar ::safe [VarName $slave] state
 
 	    set item [::tcl::OptCurDesc $desc]
 	    set name [::tcl::OptName $item]
@@ -187,15 +189,15 @@ proc ::safe::interpConfigure {args} {
 	    # create did
 	    set Args [::tcl::OptKeyParse ::safe::interpIC $args]
 	    CheckInterp $slave
-	    namespace upvar ::safe S$slave state
+	    namespace upvar ::safe [VarName $slave] state
 
 	    # Get the current (and not the default) values of whatever has
 	    # not been given:
 	    if {![::tcl::OptProcArgGiven -accessPath]} {
-		set doreset 1
+		set doreset 0
 		set accessPath $state(access_path)
 	    } else {
-		set doreset 0
+		set doreset 1
 	    }
 	    if {
 		![::tcl::OptProcArgGiven -statics]
@@ -218,14 +220,33 @@ proc ::safe::interpConfigure {args} {
 	    }
 	    # we can now reconfigure :
 	    InterpSetConfig $slave $accessPath $statics $nested $deleteHook
-	    # auto_reset the slave (to completly synch the new access_path)
+	    # auto_reset the child (to completly synch the new access_path)
 	    if {$doreset} {
 		if {[catch {::interp eval $slave {auto_reset}} msg]} {
 		    Log $slave "auto_reset failed: $msg"
 		} else {
 		    Log $slave "successful auto_reset" NOTICE
 		}
+
+		# Sync the paths used to search for Tcl modules.
+		::interp eval $slave {tcl::tm::path remove {*}[tcl::tm::list]}
+		if {[llength $state(tm_path_slave)] > 0} {
+		    ::interp eval $slave [list \
+			    ::tcl::tm::add {*}[lreverse $state(tm_path_slave)]]
+		}
+
+		# Remove stale "package ifneeded" data for non-loaded packages.
+		# - Not for loaded packages, because "package forget" erases
+		#   data from "package provide" as well as "package ifneeded".
+		# - This is OK because the script cannot reload any version of
+		#   the package unless it first does "package forget".
+		foreach pkg [::interp eval $slave {package names}] {
+		    if {[::interp eval $slave [list package provide $pkg]] eq ""} {
+			::interp eval $slave [list package forget $pkg]
+		    }
+		}
 	    }
+	    return
 	}
     }
 }
@@ -239,17 +260,17 @@ proc ::safe::interpConfigure {args} {
 #
 # safe::InterpCreate : doing the real job
 #
-# This procedure creates a safe slave and initializes it with the safe
+# This procedure creates a safe interpreter and initializes it with the safe
 # base aliases.
-# NB: slave name must be simple alphanumeric string, no spaces, no (), no
+# NB: child name must be simple alphanumeric string, no spaces, no (), no
 # {},...  {because the state array is stored as part of the name}
 #
-# Returns the slave name.
+# Returns the child name.
 #
 # Optional Arguments :
-# + slave name : if empty, generated name will be used
+# + child name : if empty, generated name will be used
 # + access_path: path list controlling where load/source can occur,
-#                if empty: the master auto_path will be used.
+#                if empty: the parent auto_path will be used.
 # + staticsok  : flag, if 0 :no static package can be loaded (load {} Xxx)
 #                      if 1 :static packages are ok.
 # + nestedok: flag, if 0 :no loading to sub-sub interps (load xx xx sub)
@@ -257,35 +278,37 @@ proc ::safe::interpConfigure {args} {
 
 # use the full name and no indent so auto_mkIndex can find us
 proc ::safe::InterpCreate {
-			   slave
+			   child
 			   access_path
 			   staticsok
 			   nestedok
 			   deletehook
 		       } {
-    # Create the slave.
-    if {$slave ne ""} {
-	::interp create -safe $slave
+    # Create the child.
+    # If evaluated in ::safe, the interpreter command for foo is ::foo;
+    # but for foo::bar is safe::foo::bar.  So evaluate in :: instead.
+    if {$child ne ""} {
+	namespace eval :: [list ::interp create -safe $child]
     } else {
-	# empty argument: generate slave name
-	set slave [::interp create -safe]
+	# empty argument: generate child name
+	set child [::interp create -safe]
     }
-    Log $slave "Created" NOTICE
+    Log $child "Created" NOTICE
 
-    # Initialize it. (returns slave name)
-    InterpInit $slave $access_path $staticsok $nestedok $deletehook
+    # Initialize it. (returns child name)
+    InterpInit $child $access_path $staticsok $nestedok $deletehook
 }
 
 #
 # InterpSetConfig (was setAccessPath) :
-#    Sets up slave virtual auto_path and corresponding structure within
-#    the master. Also sets the tcl_library in the slave to be the first
+#    Sets up child virtual auto_path and corresponding structure within
+#    the parent. Also sets the tcl_library in the child to be the first
 #    directory in the path.
-#    NB: If you change the path after the slave has been initialized you
-#    probably need to call "auto_reset" in the slave in order that it gets
+#    NB: If you change the path after the child has been initialized you
+#    probably need to call "auto_reset" in the child in order that it gets
 #    the right auto_index() array values.
 
-proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
+proc ::safe::InterpSetConfig {child access_path staticsok nestedok deletehook} {
     global auto_path
 
     # determine and store the access path if empty
@@ -295,36 +318,36 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	# Make sure that tcl_library is in auto_path and at the first
 	# position (needed by setAccessPath)
 	set where [lsearch -exact $access_path [info library]]
-	if {$where == -1} {
+	if {$where < 0} {
 	    # not found, add it.
 	    set access_path [linsert $access_path 0 [info library]]
-	    Log $slave "tcl_library was not in auto_path,\
+	    Log $child "tcl_library was not in auto_path,\
 			added it to slave's access_path" NOTICE
 	} elseif {$where != 0} {
 	    # not first, move it first
 	    set access_path [linsert \
 				 [lreplace $access_path $where $where] \
 				 0 [info library]]
-	    Log $slave "tcl_libray was not in first in auto_path,\
+	    Log $child "tcl_libray was not in first in auto_path,\
 			moved it to front of slave's access_path" NOTICE
 	}
 
 	# Add 1st level sub dirs (will searched by auto loading from tcl
-	# code in the slave using glob and thus fail, so we add them here
+	# code in the child using glob and thus fail, so we add them here
 	# so by default it works the same).
 	set access_path [AddSubDirs $access_path]
     }
 
-    Log $slave "Setting accessPath=($access_path) staticsok=$staticsok\
+    Log $child "Setting accessPath=($access_path) staticsok=$staticsok\
 		nestedok=$nestedok deletehook=($deletehook)" NOTICE
 
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $child] state
 
     # clear old autopath if it existed
     # build new one
     # Extend the access list with the paths used to look for Tcl Modules.
     # We save the virtual form separately as well, as syncing it with the
-    # slave has to be defered until the necessary commands are present for
+    # child has to be deferred until the necessary commands are present for
     # setup.
 
     set norm_access_path  {}
@@ -344,6 +367,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     }
 
     set morepaths [::tcl::tm::list]
+    set firstpass 1
     while {[llength $morepaths]} {
 	set addpaths $morepaths
 	set morepaths {}
@@ -352,6 +376,12 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    # Prevent the addition of dirs on the tm list to the
 	    # result if they are already known.
 	    if {[dict exists $remap_access_path $dir]} {
+	        if {$firstpass} {
+		    # $dir is in [::tcl::tm::list] and belongs in the slave_tm_path.
+		    # Later passes handle subdirectories, which belong in the
+		    # access path but not in the module path.
+		    lappend slave_tm_path  [dict get $remap_access_path $dir]
+		}
 		continue
 	    }
 
@@ -361,7 +391,12 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    lappend map_access_path    $token $dir
 	    lappend remap_access_path  $dir $token
 	    lappend norm_access_path   [file normalize $dir]
-	    lappend slave_tm_path $token
+	    if {$firstpass} {
+		# $dir is in [::tcl::tm::list] and belongs in the slave_tm_path.
+		# Later passes handle subdirectories, which belong in the
+		# access path but not in the module path.
+		lappend slave_tm_path  $token
+	    }
 	    incr i
 
 	    # [Bug 2854929]
@@ -372,6 +407,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 	    # subdirectories.
 	    lappend morepaths {*}[glob -nocomplain -directory $dir -type d *]
 	}
+	set firstpass 0
     }
 
     set state(access_path)       $access_path
@@ -384,7 +420,8 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
     set state(nestedok)          $nestedok
     set state(cleanupHook)       $deletehook
 
-    SyncAccessPath $slave
+    SyncAccessPath $child
+    return
 }
 
 #
@@ -392,11 +429,12 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook} {
 # FindInAccessPath:
 #    Search for a real directory and returns its virtual Id (including the
 #    "$")
-proc ::safe::interpFindInAccessPath {slave path} {
-    namespace upvar ::safe S$slave state
+proc ::safe::interpFindInAccessPath {child path} {
+    CheckInterp $child
+    namespace upvar ::safe [VarName $child] state
 
     if {![dict exists $state(access_path,remap) $path]} {
-	return -code error "$path not found in access path $access_path"
+	return -code error "$path not found in access path"
     }
 
     return [dict get $state(access_path,remap) $path]
@@ -406,10 +444,11 @@ proc ::safe::interpFindInAccessPath {slave path} {
 # addToAccessPath:
 #    add (if needed) a real directory to access path and return its
 #    virtual token (including the "$").
-proc ::safe::interpAddToAccessPath {slave path} {
+proc ::safe::interpAddToAccessPath {child path} {
     # first check if the directory is already in there
     # (inlined interpFindInAccessPath).
-    namespace upvar ::safe S$slave state
+    CheckInterp $child
+    namespace upvar ::safe [VarName $child] state
 
     if {[dict exists $state(access_path,remap) $path]} {
 	return [dict get $state(access_path,remap) $path]
@@ -424,7 +463,7 @@ proc ::safe::interpAddToAccessPath {slave path} {
     lappend state(access_path,remap) $path $token
     lappend state(access_path,norm)  [file normalize $path]
 
-    SyncAccessPath $slave
+    SyncAccessPath $child
     return $token
 }
 
@@ -432,25 +471,25 @@ proc ::safe::interpAddToAccessPath {slave path} {
 # interpreter. It is useful when you want to install the safe base aliases
 # into a preexisting safe interpreter.
 proc ::safe::InterpInit {
-			 slave
+			 child
 			 access_path
 			 staticsok
 			 nestedok
 			 deletehook
 		     } {
     # Configure will generate an access_path when access_path is empty.
-    InterpSetConfig $slave $access_path $staticsok $nestedok $deletehook
+    InterpSetConfig $child $access_path $staticsok $nestedok $deletehook
 
     # NB we need to add [namespace current], aliases are always absolute
     # paths.
 
-    # These aliases let the slave load files to define new commands
-    # This alias lets the slave use the encoding names, convertfrom,
+    # These aliases let the child load files to define new commands
+    # This alias lets the child use the encoding names, convertfrom,
     # convertto, and system, but not "encoding system <name>" to set the
     # system encoding.
     # Handling Tcl Modules, we need a restricted form of Glob.
     # This alias interposes on the 'exit' command and cleanly terminates
-    # the slave.
+    # the child.
 
     foreach {command alias} {
 	source   AliasSource
@@ -459,61 +498,61 @@ proc ::safe::InterpInit {
 	exit     interpDelete
 	glob     AliasGlob
     } {
-	::interp alias $slave $command {} [namespace current]::$alias $slave
+	::interp alias $child $command {} [namespace current]::$alias $child
     }
 
-    # This alias lets the slave have access to a subset of the 'file'
+    # This alias lets the child have access to a subset of the 'file'
     # command functionality.
 
-    ::interp expose $slave file
+    ::interp expose $child file
     foreach subcommand {dirname extension rootname tail} {
-	::interp alias $slave ::tcl::file::$subcommand {} \
-	    ::safe::AliasFileSubcommand $slave $subcommand
+	::interp alias $child ::tcl::file::$subcommand {} \
+	    ::safe::AliasFileSubcommand $child $subcommand
     }
     foreach subcommand {
 	atime attributes copy delete executable exists isdirectory isfile
 	link lstat mtime mkdir nativename normalize owned readable readlink
 	rename size stat tempfile type volumes writable
     } {
-	::interp alias $slave ::tcl::file::$subcommand {} \
-	    ::safe::BadSubcommand $slave file $subcommand
+	::interp alias $child ::tcl::file::$subcommand {} \
+	    ::safe::BadSubcommand $child file $subcommand
     }
 
     # Subcommands of info
     foreach {subcommand alias} {
 	nameofexecutable   AliasExeName
     } {
-	::interp alias $slave ::tcl::info::$subcommand \
-	    {} [namespace current]::$alias $slave
+	::interp alias $child ::tcl::info::$subcommand \
+	    {} [namespace current]::$alias $child
     }
 
-    # The allowed slave variables already have been set by Tcl_MakeSafe(3)
+    # The allowed child variables already have been set by Tcl_MakeSafe(3)
 
-    # Source init.tcl and tm.tcl into the slave, to get auto_load and
+    # Source init.tcl and tm.tcl into the child, to get auto_load and
     # other procedures defined:
 
-    if {[catch {::interp eval $slave {
+    if {[catch {::interp eval $child {
 	source [file join $tcl_library init.tcl]
     }} msg opt]} {
-	Log $slave "can't source init.tcl ($msg)"
-	return -options $opt "can't source init.tcl into slave $slave ($msg)"
+	Log $child "can't source init.tcl ($msg)"
+	return -options $opt "can't source init.tcl into slave $child ($msg)"
     }
 
-    if {[catch {::interp eval $slave {
+    if {[catch {::interp eval $child {
 	source [file join $tcl_library tm.tcl]
     }} msg opt]} {
-	Log $slave "can't source tm.tcl ($msg)"
-	return -options $opt "can't source tm.tcl into slave $slave ($msg)"
+	Log $child "can't source tm.tcl ($msg)"
+	return -options $opt "can't source tm.tcl into slave $child ($msg)"
     }
 
     # Sync the paths used to search for Tcl modules. This can be done only
     # now, after tm.tcl was loaded.
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $child] state
     if {[llength $state(tm_path_slave)] > 0} {
-	::interp eval $slave [list \
+	::interp eval $child [list \
 		::tcl::tm::add {*}[lreverse $state(tm_path_slave)]]
     }
-    return $slave
+    return $child
 }
 
 # Add (only if needed, avoid duplicates) 1 level of sub directories to an
@@ -539,15 +578,30 @@ proc ::safe::AddSubDirs {pathList} {
     return $res
 }
 
-# This procedure deletes a safe slave managed by Safe Tcl and cleans up
-# associated state:
-
-proc ::safe::interpDelete {slave} {
-    Log $slave "About to delete" NOTICE
-
-    namespace upvar ::safe S$slave state
+# This procedure deletes a safe interpreter managed by Safe Tcl and cleans up
+# associated state.
+# - The command will also delete non-Safe-Base interpreters.
+# - This is regrettable, but to avoid breaking existing code this should be
+#   amended at the next major revision by uncommenting "CheckInterp".
+
+proc ::safe::interpDelete {child} {
+    Log $child "About to delete" NOTICE
+
+    # CheckInterp $child
+    namespace upvar ::safe [VarName $child] state
+
+    # When an interpreter is deleted with [interp delete], any sub-interpreters
+    # are deleted automatically, but this leaves behind their data in the Safe
+    # Base. To clean up properly, we call safe::interpDelete recursively on each
+    # Safe Base sub-interpreter, so each one is deleted cleanly and not by
+    # the automatic mechanism built into [interp delete].
+    foreach sub [interp children $child] {
+        if {[info exists ::safe::[VarName [list $child $sub]]]} {
+            ::safe::interpDelete [list $child $sub]
+        }
+    }
 
-    # If the slave has a cleanup hook registered, call it.  Check the
+    # If the child has a cleanup hook registered, call it.  Check the
     # existance because we might be called to delete an interp which has
     # not been registered with us at all
 
@@ -558,14 +612,14 @@ proc ::safe::interpDelete {slave} {
 	    # we'll loop
 	    unset state(cleanupHook)
 	    try {
-		{*}$hook $slave
+		{*}$hook $child
 	    } on error err {
-		Log $slave "Delete hook error ($err)"
+		Log $child "Delete hook error ($err)"
 	    }
 	}
     }
 
-    # Discard the global array of state associated with the slave, and
+    # Discard the global array of state associated with the child, and
     # delete the interpreter.
 
     if {[info exists state]} {
@@ -574,9 +628,9 @@ proc ::safe::interpDelete {slave} {
 
     # if we have been called twice, the interp might have been deleted
     # already
-    if {[::interp exists $slave]} {
-	::interp delete $slave
-	Log $slave "Deleted" NOTICE
+    if {[::interp exists $child]} {
+	::interp delete $child
+	Log $child "Deleted" NOTICE
     }
 
     return
@@ -602,9 +656,9 @@ proc ::safe::setLogCmd {args} {
     } else {
 	# Activate logging, define proper command.
 
-	proc ::safe::Log {slave msg {type ERROR}} {
+	proc ::safe::Log {child msg {type ERROR}} {
 	    variable Log
-	    {*}$Log "$type for slave $slave : $msg"
+	    {*}$Log "$type for slave $child : $msg"
 	    return
 	}
     }
@@ -613,23 +667,23 @@ proc ::safe::setLogCmd {args} {
 # ------------------- END OF PUBLIC METHODS ------------
 
 #
-# Sets the slave auto_path to the master recorded value.  Also sets
+# Sets the child auto_path to the parent recorded value.  Also sets
 # tcl_library to the first token of the virtual path.
 #
-proc ::safe::SyncAccessPath {slave} {
-    namespace upvar ::safe S$slave state
+proc ::safe::SyncAccessPath {child} {
+    namespace upvar ::safe [VarName $child] state
 
     set slave_access_path $state(access_path,slave)
-    ::interp eval $slave [list set auto_path $slave_access_path]
+    ::interp eval $child [list set auto_path $slave_access_path]
 
-    Log $slave "auto_path in $slave has been set to $slave_access_path"\
+    Log $child "auto_path in $child has been set to $slave_access_path"\
 	NOTICE
 
     # This code assumes that info library is the first element in the
     # list of auto_path's. See -> InterpSetConfig for the code which
     # ensures this condition.
 
-    ::interp eval $slave [list \
+    ::interp eval $child [list \
 	      set tcl_library [lindex $slave_access_path 0]]
 }
 
@@ -643,8 +697,8 @@ proc ::safe::PathToken {n} {
 #
 # translate virtual path into real path
 #
-proc ::safe::TranslatePath {slave path} {
-    namespace upvar ::safe S$slave state
+proc ::safe::TranslatePath {child path} {
+    namespace upvar ::safe [VarName $child] state
 
     # somehow strip the namespaces 'functionality' out (the danger is that
     # we would strip valid macintosh "../" queries... :
@@ -659,7 +713,7 @@ proc ::safe::TranslatePath {slave path} {
 
 # file name control (limit access to files/resources that should be a
 # valid tcl source file)
-proc ::safe::CheckFileName {slave file} {
+proc ::safe::CheckFileName {child file} {
     # This used to limit what can be sourced to ".tcl" and forbid files
     # with more than 1 dot and longer than 14 chars, but I changed that
     # for 8.4 as a safe interp has enough internal protection already to
@@ -680,17 +734,17 @@ proc ::safe::CheckFileName {slave file} {
 # interpreters that are *almost* safe. In particular, it just acts to
 # prevent discovery of what home directories exist.
 
-proc ::safe::AliasFileSubcommand {slave subcommand name} {
+proc ::safe::AliasFileSubcommand {child subcommand name} {
     if {[string match ~* $name]} {
 	set name ./$name
     }
-    tailcall ::interp invokehidden $slave tcl:file:$subcommand $name
+    tailcall ::interp invokehidden $child tcl:file:$subcommand $name
 }
 
 # AliasGlob is the target of the "glob" alias in safe interpreters.
 
-proc ::safe::AliasGlob {slave args} {
-    Log $slave "GLOB ! $args" NOTICE
+proc ::safe::AliasGlob {child args} {
+    Log $child "GLOB ! $args" NOTICE
     set cmd {}
     set at 0
     array set got {
@@ -712,11 +766,15 @@ proc ::safe::AliasGlob {slave args} {
 
     while {$at < [llength $args]} {
 	switch -glob -- [set opt [lindex $args $at]] {
-	    -nocomplain - -- - -join - -tails {
+	    -nocomplain - -- - -tails {
 		lappend cmd $opt
 		set got($opt) 1
 		incr at
 	    }
+	    -join {
+		set got($opt) 1
+		incr at
+	    }
 	    -types - -type {
 		lappend cmd -types [lindex $args [incr at]]
 		incr at
@@ -730,15 +788,8 @@ proc ::safe::AliasGlob {slave args} {
 		set virtualdir [lindex $args [incr at]]
 		incr at
 	    }
-	    pkgIndex.tcl {
-		# Oops, this is globbing a subdirectory in regular package
-		# search. That is not wanted. Abort, handler does catch
-		# already (because glob was not defined before). See
-		# package.tcl, lines 484ff in tclPkgUnknown.
-		return -code error "unknown command glob"
-	    }
 	    -* {
-		Log $slave "Safe base rejecting glob option '$opt'"
+		Log $child "Safe base rejecting glob option '$opt'"
 		return -code error "Safe base rejecting glob option '$opt'"
 	    }
 	    default {
@@ -749,73 +800,116 @@ proc ::safe::AliasGlob {slave args} {
     }
 
     # Get the real path from the virtual one and check that the path is in the
-    # access path of that slave. Done after basic argument processing so that
+    # access path of that child. Done after basic argument processing so that
     # we know if -nocomplain is set.
     if {$got(-directory)} {
 	try {
-	    set dir [TranslatePath $slave $virtualdir]
-	    DirInAccessPath $slave $dir
+	    set dir [TranslatePath $child $virtualdir]
+	    DirInAccessPath $child $dir
 	} on error msg {
-	    Log $slave $msg
+	    Log $child $msg
 	    if {$got(-nocomplain)} return
 	    return -code error "permission denied"
 	}
-	lappend cmd -directory $dir
+	if {$got(--)} {
+	    set cmd [linsert $cmd end-1 -directory $dir]
+	} else {
+	    lappend cmd -directory $dir
+	}
+    } else {
+	# The code after this "if ... else" block would conspire to return with
+	# no results in this case, if it were allowed to proceed.  Instead,
+	# return now and reduce the number of cases to be considered later.
+	Log $child {option -directory must be supplied}
+	if {$got(-nocomplain)} return
+	return -code error "permission denied"
     }
 
-    # Apply the -join semantics ourselves
+    # Apply the -join semantics ourselves.
     if {$got(-join)} {
 	set args [lreplace $args $at end [join [lrange $args $at end] "/"]]
     }
 
-    # Process remaining pattern arguments
+    # Process the pattern arguments.  If we've done a join there is only one
+    # pattern argument.
+
     set firstPattern [llength $cmd]
     foreach opt [lrange $args $at end] {
 	if {![regexp $dirPartRE $opt -> thedir thefile]} {
 	    set thedir .
-	} elseif {[string match ~* $thedir]} {
-	    set thedir ./$thedir
+	    # The *.tm search comes here.
 	}
-	if {$thedir eq "*" &&
-		($thefile eq "pkgIndex.tcl" || $thefile eq "*.tm")} {
+	# "Special" treatment for (joined) argument {*/pkgIndex.tcl}.
+	# Do the expansion of "*" here, and filter out any directories that are
+	# not in the access path.  The outcome is to lappend to cmd a path of
+	# the form $virtualdir/subdir/pkgIndex.tcl for each subdirectory subdir,
+	# after removing any subdir that are not in the access path.
+	if {($thedir eq "*") && ($thefile eq "pkgIndex.tcl")} {
 	    set mapped 0
-	    foreach d [glob -directory [TranslatePath $slave $virtualdir] \
+	    foreach d [glob -directory [TranslatePath $child $virtualdir] \
 			   -types d -tails *] {
 		catch {
-		    DirInAccessPath $slave \
-			[TranslatePath $slave [file join $virtualdir $d]]
+		    DirInAccessPath $child \
+			[TranslatePath $child [file join $virtualdir $d]]
 		    lappend cmd [file join $d $thefile]
 		    set mapped 1
 		}
 	    }
 	    if {$mapped} continue
+	    # Don't [continue] if */pkgIndex.tcl has no matches in the access
+	    # path.  The pattern will now receive the same treatment as a
+	    # "non-special" pattern (and will fail because it includes a "*" in
+	    # the directory name).
 	}
+	# Any directory pattern that is not an exact (i.e. non-glob) match to a
+	# directory in the access path will be rejected here.
+	# - Rejections include any directory pattern that has glob matching
+	#   patterns "*", "?", backslashes, braces or square brackets, (UNLESS
+	#   it corresponds to a genuine directory name AND that directory is in
+	#   the access path).
+	# - The only "special matching characters" that remain in patterns for
+	#   processing by glob are in the filename tail.
+	# - [file join $anything ~${foo}] is ~${foo}, which is not an exact
+	#   match to any directory in the access path.  Hence directory patterns
+	#   that begin with "~" are rejected here.  Tests safe-16.[5-8] check
+	#   that "file join" remains as required and does not expand ~${foo}.
+	# - Bug [3529949] relates to unwanted expansion of ~${foo} and this is
+	#   how the present code avoids the bug.  All tests safe-16.* relate.
 	try {
-	    DirInAccessPath $slave [TranslatePath $slave \
+	    DirInAccessPath $child [TranslatePath $child \
 		    [file join $virtualdir $thedir]]
 	} on error msg {
-	    Log $slave $msg
+	    Log $child $msg
 	    if {$got(-nocomplain)} continue
 	    return -code error "permission denied"
 	}
 	lappend cmd $opt
     }
 
-    Log $slave "GLOB = $cmd" NOTICE
+    Log $child "GLOB = $cmd" NOTICE
 
     if {$got(-nocomplain) && [llength $cmd] eq $firstPattern} {
 	return
     }
     try {
-	set entries [::interp invokehidden $slave glob {*}$cmd]
+	# >>>>>>>>>> HERE'S THE CALL TO SAFE INTERP GLOB <<<<<<<<<<
+	# - Pattern arguments added to cmd have NOT been translated from tokens.
+	#   Only the virtualdir is translated (to dir).
+	# - In the pkgIndex.tcl case, there is no "*" in the pattern arguments,
+	#   which are a list of names each with tail pkgIndex.tcl.  The purpose
+	#   of the call to glob is to remove the names for which the file does
+	#   not exist.
+	set entries [::interp invokehidden $child glob {*}$cmd]
     } on error msg {
-	Log $slave $msg
+	# This is the only place that a call with -nocomplain and no invalid
+	# "dash-options" can return an error.
+	Log $child $msg
 	return -code error "script error"
     }
 
-    Log $slave "GLOB < $entries" NOTICE
+    Log $child "GLOB < $entries" NOTICE
 
-    # Translate path back to what the slave should see.
+    # Translate path back to what the child should see.
     set res {}
     set l [string length $dir]
     foreach p $entries {
@@ -825,13 +919,13 @@ proc ::safe::AliasGlob {slave args} {
 	lappend res $p
     }
 
-    Log $slave "GLOB > $res" NOTICE
+    Log $child "GLOB > $res" NOTICE
     return $res
 }
 
 # AliasSource is the target of the "source" alias in safe interpreters.
 
-proc ::safe::AliasSource {slave args} {
+proc ::safe::AliasSource {child args} {
     set argc [llength $args]
     # Extended for handling of Tcl Modules to allow not only "source
     # filename", but "source -encoding E filename" as well.
@@ -840,7 +934,7 @@ proc ::safe::AliasSource {slave args} {
 	set encoding [lindex $args 1]
 	set at 2
 	if {$encoding eq "identity"} {
-	    Log $slave "attempt to use the identity encoding"
+	    Log $child "attempt to use the identity encoding"
 	    return -code error "permission denied"
 	}
     } else {
@@ -849,39 +943,42 @@ proc ::safe::AliasSource {slave args} {
     }
     if {$argc != 1} {
 	set msg "wrong # args: should be \"source ?-encoding E? fileName\""
-	Log $slave "$msg ($args)"
+	Log $child "$msg ($args)"
 	return -code error $msg
     }
     set file [lindex $args $at]
 
     # get the real path from the virtual one.
     if {[catch {
-	set realfile [TranslatePath $slave $file]
+	set realfile [TranslatePath $child $file]
     } msg]} {
-	Log $slave $msg
+	Log $child $msg
 	return -code error "permission denied"
     }
 
-    # check that the path is in the access path of that slave
+    # check that the path is in the access path of that child
     if {[catch {
-	FileInAccessPath $slave $realfile
+	FileInAccessPath $child $realfile
     } msg]} {
-	Log $slave $msg
+	Log $child $msg
 	return -code error "permission denied"
     }
 
-    # do the checks on the filename :
+    # Check that the filename exists and is readable.  If it is not, deliver
+    # this -errorcode so that caller in tclPkgUnknown does not write a message
+    # to tclLog.  Has no effect on other callers of ::source, which are in
+    # "package ifneeded" scripts.
     if {[catch {
-	CheckFileName $slave $realfile
+	CheckFileName $child $realfile
     } msg]} {
-	Log $slave "$realfile:$msg"
-	return -code error $msg
+	Log $child "$realfile:$msg"
+	return -code error -errorcode {POSIX EACCES} $msg
     }
 
     # Passed all the tests, lets source it. Note that we do this all manually
-    # because we want to control [info script] in the slave so information
+    # because we want to control [info script] in the child so information
     # doesn't leak so much. [Bug 2913625]
-    set old [::interp eval $slave {info script}]
+    set old [::interp eval $child {info script}]
     set replacementMsg "script error"
     set code [catch {
 	set f [open $realfile]
@@ -891,17 +988,17 @@ proc ::safe::AliasSource {slave args} {
 	}
 	set contents [read $f]
 	close $f
-	::interp eval $slave [list info script $file]
+	::interp eval $child [list info script $file]
     } msg opt]
     if {$code == 0} {
-	set code [catch {::interp eval $slave $contents} msg opt]
+	set code [catch {::interp eval $child $contents} msg opt]
 	set replacementMsg $msg
     }
-    catch {interp eval $slave [list info script $old]}
+    catch {interp eval $child [list info script $old]}
     # Note that all non-errors are fine result codes from [source], so we must
     # take a little care to do it properly. [Bug 2923613]
     if {$code == 1} {
-	Log $slave $msg
+	Log $child $msg
 	return -code error $replacementMsg
     }
     return -code $code -options $opt $msg
@@ -909,18 +1006,18 @@ proc ::safe::AliasSource {slave args} {
 
 # AliasLoad is the target of the "load" alias in safe interpreters.
 
-proc ::safe::AliasLoad {slave file args} {
+proc ::safe::AliasLoad {child file args} {
     set argc [llength $args]
     if {$argc > 2} {
 	set msg "load error: too many arguments"
-	Log $slave "$msg ($argc) {$file $args}"
+	Log $child "$msg ($argc) {$file $args}"
 	return -code error $msg
     }
 
     # package name (can be empty if file is not).
     set package [lindex $args 0]
 
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $child] state
 
     # Determine where to load. load use a relative interp path and {}
     # means self, so we can directly and safely use passed arg.
@@ -929,7 +1026,7 @@ proc ::safe::AliasLoad {slave file args} {
 	# we will try to load into a sub sub interp; check that we want to
 	# authorize that.
 	if {!$state(nestedok)} {
-	    Log $slave "loading to a sub interp (nestedok)\
+	    Log $child "loading to a sub interp (nestedok)\
 			disabled (trying to load $package to $target)"
 	    return -code error "permission denied (nested load)"
 	}
@@ -940,11 +1037,11 @@ proc ::safe::AliasLoad {slave file args} {
 	# static package loading
 	if {$package eq ""} {
 	    set msg "load error: empty filename and no package name"
-	    Log $slave $msg
+	    Log $child $msg
 	    return -code error $msg
 	}
 	if {!$state(staticsok)} {
-	    Log $slave "static packages loading disabled\
+	    Log $child "static packages loading disabled\
 			(trying to load $package to $target)"
 	    return -code error "permission denied (static package)"
 	}
@@ -953,36 +1050,43 @@ proc ::safe::AliasLoad {slave file args} {
 
 	# get the real path from the virtual one.
 	try {
-	    set file [TranslatePath $slave $file]
+	    set file [TranslatePath $child $file]
 	} on error msg {
-	    Log $slave $msg
+	    Log $child $msg
 	    return -code error "permission denied"
 	}
 
 	# check the translated path
 	try {
-	    FileInAccessPath $slave $file
+	    FileInAccessPath $child $file
 	} on error msg {
-	    Log $slave $msg
+	    Log $child $msg
 	    return -code error "permission denied (path)"
 	}
     }
 
     try {
-	return [::interp invokehidden $slave load $file $package $target]
+	return [::interp invokehidden $child load $file $package $target]
     } on error msg {
-	Log $slave $msg
+	# Some packages return no error message.
+	set msg0 "load of binary library for package $package failed"
+	if {$msg eq {}} {
+	    set msg $msg0
+	} else {
+	    set msg "$msg0: $msg"
+	}
+	Log $child $msg
 	return -code error $msg
     }
 }
 
 # FileInAccessPath raises an error if the file is not found in the list of
-# directories contained in the (master side recorded) slave's access path.
+# directories contained in the (parent side recorded) child's access path.
 
 # the security here relies on "file dirname" answering the proper
 # result... needs checking ?
-proc ::safe::FileInAccessPath {slave file} {
-    namespace upvar ::safe S$slave state
+proc ::safe::FileInAccessPath {child file} {
+    namespace upvar ::safe [VarName $child] state
     set access_path $state(access_path)
 
     if {[file isdirectory $file]} {
@@ -994,14 +1098,14 @@ proc ::safe::FileInAccessPath {slave file} {
     # potential pathname anomalies.
     set norm_parent [file normalize $parent]
 
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $child] state
     if {$norm_parent ni $state(access_path,norm)} {
 	return -code error "\"$file\": not in access_path"
     }
 }
 
-proc ::safe::DirInAccessPath {slave dir} {
-    namespace upvar ::safe S$slave state
+proc ::safe::DirInAccessPath {child dir} {
+    namespace upvar ::safe [VarName $child] state
     set access_path $state(access_path)
 
     if {[file isfile $dir]} {
@@ -1012,7 +1116,7 @@ proc ::safe::DirInAccessPath {slave dir} {
     # potential pathname anomalies.
     set norm_dir [file normalize $dir]
 
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $child] state
     if {$norm_dir ni $state(access_path,norm)} {
 	return -code error "\"$dir\": not in access_path"
     }
@@ -1021,16 +1125,16 @@ proc ::safe::DirInAccessPath {slave dir} {
 # This procedure is used to report an attempt to use an unsafe member of an
 # ensemble command.
 
-proc ::safe::BadSubcommand {slave command subcommand args} {
+proc ::safe::BadSubcommand {child command subcommand args} {
     set msg "not allowed to invoke subcommand $subcommand of $command"
-    Log $slave $msg
+    Log $child $msg
     return -code error -errorcode {TCL SAFE SUBCOMMAND} $msg
 }
 
 # AliasEncoding is the target of the "encoding" alias in safe interpreters.
 
-proc ::safe::AliasEncoding {slave option args} {
-    # Note that [encoding dirs] is not supported in safe slaves at all
+proc ::safe::AliasEncoding {child option args} {
+    # Note that [encoding dirs] is not supported in safe children at all
     set subcommands {convertfrom convertto names system}
     try {
 	set option [tcl::prefix match -error [list -level 1 -errorcode \
@@ -1041,18 +1145,70 @@ proc ::safe::AliasEncoding {slave option args} {
 		"wrong # args: should be \"encoding system\""
 	}
     } on error {msg options} {
-	Log $slave $msg
+	Log $child $msg
 	return -options $options $msg
     }
-    tailcall ::interp invokehidden $slave encoding $option {*}$args
+    tailcall ::interp invokehidden $child encoding $option {*}$args
 }
 
 # Various minor hiding of platform features. [Bug 2913625]
 
-proc ::safe::AliasExeName {slave} {
+proc ::safe::AliasExeName {child} {
     return ""
 }
 
+# ------------------------------------------------------------------------------
+# Using Interpreter Names with Namespace Qualifiers
+# ------------------------------------------------------------------------------
+# (1) We wish to preserve compatibility with existing code, in which Safe Base
+#     interpreter names have no namespace qualifiers.
+# (2) safe::interpCreate and the rest of the Safe Base previously could not
+#     accept namespace qualifiers in an interpreter name.
+# (3) The interp command will accept namespace qualifiers in an interpreter
+#     name, but accepts distinct interpreters that will have the same command
+#     name (e.g. foo, ::foo, and :::foo) (bug 66c2e8c974).
+# (4) To satisfy these constraints, Safe Base interpreter names will be fully
+#     qualified namespace names with no excess colons and with the leading "::"
+#     omitted.
+# (5) Trailing "::" implies a namespace tail {}, which interp reads as {{}}.
+#     Reject such names.
+# (6) We could:
+#     (a) EITHER reject usable but non-compliant names (e.g. excess colons) in
+#         interpCreate, interpInit;
+#     (b) OR accept such names and then translate to a compliant name in every
+#         command.
+#     The problem with (b) is that the user will expect to use the name with the
+#     interp command and will find that it is not recognised.
+#     E.g "interpCreate ::foo" creates interpreter "foo", and the user's name
+#     "::foo" works with all the Safe Base commands, but "interp eval ::foo"
+#     fails.
+#     So we choose (a).
+# (7) The command
+#         namespace upvar ::safe S$child state
+#     becomes
+#         namespace upvar ::safe [VarName $child] state
+# ------------------------------------------------------------------------------
+
+proc ::safe::RejectExcessColons {child} {
+    set stripped [regsub -all -- {:::*} $child ::]
+    if {[string range $stripped end-1 end] eq {::}} {
+        return -code error {interpreter name must not end in "::"}
+    }
+    if {$stripped ne $child} {
+        set msg {interpreter name has excess colons in namespace separators}
+        return -code error $msg
+    }
+    if {[string range $stripped 0 1] eq {::}} {
+        return -code error {interpreter name must not begin "::"}
+    }
+    return
+}
+
+proc ::safe::VarName {child} {
+    # return S$child
+    return S[string map {:: @N @ @A} $child]
+}
+
 proc ::safe::Setup {} {
     ####
     #
@@ -1111,20 +1267,20 @@ namespace eval ::safe {
     # Log command, set via 'setLogCmd'. Logging is disabled when empty.
     variable Log {}
 
-    # The package maintains a state array per slave interp under its
+    # The package maintains a state array per child interp under its
     # control. The name of this array is S<interp-name>. This array is
     # brought into scope where needed, using 'namespace upvar'. The S
-    # prefix is used to avoid that a slave interp called "Log" smashes
+    # prefix is used to avoid that a child interp called "Log" smashes
     # the "Log" variable.
     #
     # The array's elements are:
     #
-    # access_path       : List of paths accessible to the slave.
+    # access_path       : List of paths accessible to the child.
     # access_path,norm  : Ditto, in normalized form.
-    # access_path,slave : Ditto, as the path tokens as seen by the slave.
+    # access_path,slave : Ditto, as the path tokens as seen by the child.
     # access_path,map   : dict ( token -> path )
     # access_path,remap : dict ( path -> token )
-    # tm_path_slave     : List of TM root directories, as tokens seen by the slave.
+    # tm_path_slave     : List of TM root directories, as tokens seen by the child.
     # staticsok         : Value of option -statics
     # nestedok          : Value of option -nested
     # cleanupHook       : Value of option -deleteHook
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tm.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/tm.tcl
index 1802bb901d8..c60084cc037 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tm.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tm.tcl
@@ -212,11 +212,12 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 	    }
 	    set strip [llength [file split $path]]
 
-	    # We can't use glob in safe interps, so enclose the following in a
-	    # catch statement, where we get the module files out of the
-	    # subdirectories. In other words, Tcl Modules are not-functional
-	    # in such an interpreter. This is the same as for the command
-	    # "tclPkgUnknown", i.e. the search for regular packages.
+	    # Get the module files out of the subdirectories.
+	    # - Safe Base interpreters have a restricted "glob" command that
+	    #   works in this case.
+	    # - The "catch" was essential when there was no safe glob and every
+	    #   call in a safe interp failed; it is retained only for corner
+	    #   cases in which the eventual call to glob returns an error.
 
 	    catch {
 		# We always look for _all_ possible modules in the current
@@ -238,12 +239,16 @@ proc ::tcl::tm::UnknownHandler {original name args} {
 			continue
 		    }
 
-		    if {[package ifneeded $pkgname $pkgversion] ne {}} {
+		    if {([package ifneeded $pkgname $pkgversion] ne {})
+			    && (![interp issafe])
+		    } {
 			# There's already a provide script registered for
 			# this version of this package.  Since all units of
 			# code claiming to be the same version of the same
 			# package ought to be identical, just stick with
 			# the one we already have.
+			# This does not apply to Safe Base interpreters because
+			# the token-to-directory mapping may have changed.
 			continue
 		    }
 
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Accra b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Accra
index f43f7513224..3f755f637d5 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Accra
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Accra
@@ -2,51 +2,65 @@
 
 set TZData(:Africa/Accra) {
     {-9223372036854775808 -52 0 LMT}
-    {-1640995148 0 0 GMT}
-    {-1556841600 1200 1 GMT}
-    {-1546388400 0 0 GMT}
-    {-1525305600 1200 1 GMT}
-    {-1514852400 0 0 GMT}
-    {-1493769600 1200 1 GMT}
-    {-1483316400 0 0 GMT}
-    {-1462233600 1200 1 GMT}
-    {-1451780400 0 0 GMT}
-    {-1430611200 1200 1 GMT}
-    {-1420158000 0 0 GMT}
-    {-1399075200 1200 1 GMT}
-    {-1388622000 0 0 GMT}
-    {-1367539200 1200 1 GMT}
-    {-1357086000 0 0 GMT}
-    {-1336003200 1200 1 GMT}
-    {-1325550000 0 0 GMT}
-    {-1304380800 1200 1 GMT}
-    {-1293927600 0 0 GMT}
-    {-1272844800 1200 1 GMT}
-    {-1262391600 0 0 GMT}
-    {-1241308800 1200 1 GMT}
-    {-1230855600 0 0 GMT}
-    {-1209772800 1200 1 GMT}
-    {-1199319600 0 0 GMT}
-    {-1178150400 1200 1 GMT}
-    {-1167697200 0 0 GMT}
-    {-1146614400 1200 1 GMT}
-    {-1136161200 0 0 GMT}
-    {-1115078400 1200 1 GMT}
-    {-1104625200 0 0 GMT}
-    {-1083542400 1200 1 GMT}
-    {-1073089200 0 0 GMT}
-    {-1051920000 1200 1 GMT}
-    {-1041466800 0 0 GMT}
-    {-1020384000 1200 1 GMT}
-    {-1009930800 0 0 GMT}
-    {-988848000 1200 1 GMT}
-    {-978394800 0 0 GMT}
-    {-957312000 1200 1 GMT}
-    {-946858800 0 0 GMT}
-    {-925689600 1200 1 GMT}
-    {-915236400 0 0 GMT}
-    {-894153600 1200 1 GMT}
-    {-883700400 0 0 GMT}
-    {-862617600 1200 1 GMT}
-    {-852164400 0 0 GMT}
+    {-1709337548 0 0 GMT}
+    {-1581206400 1200 1 +0020}
+    {-1577917200 0 0 GMT}
+    {-1556834400 1200 1 +0020}
+    {-1546294800 0 0 GMT}
+    {-1525298400 1200 1 +0020}
+    {-1514758800 0 0 GMT}
+    {-1493762400 1200 1 +0020}
+    {-1483222800 0 0 GMT}
+    {-1462226400 1200 1 +0020}
+    {-1451686800 0 0 GMT}
+    {-1430604000 1200 1 +0020}
+    {-1420064400 0 0 GMT}
+    {-1399068000 1200 1 +0020}
+    {-1388528400 0 0 GMT}
+    {-1367532000 1200 1 +0020}
+    {-1356992400 0 0 GMT}
+    {-1335996000 1200 1 +0020}
+    {-1325456400 0 0 GMT}
+    {-1304373600 1200 1 +0020}
+    {-1293834000 0 0 GMT}
+    {-1272837600 1200 1 +0020}
+    {-1262298000 0 0 GMT}
+    {-1241301600 1200 1 +0020}
+    {-1230762000 0 0 GMT}
+    {-1209765600 1200 1 +0020}
+    {-1199226000 0 0 GMT}
+    {-1178143200 1200 1 +0020}
+    {-1167603600 0 0 GMT}
+    {-1146607200 1200 1 +0020}
+    {-1136067600 0 0 GMT}
+    {-1115071200 1200 1 +0020}
+    {-1104531600 0 0 GMT}
+    {-1083535200 1200 1 +0020}
+    {-1072995600 0 0 GMT}
+    {-1051912800 1200 1 +0020}
+    {-1041373200 0 0 GMT}
+    {-1020376800 1200 1 +0020}
+    {-1009837200 0 0 GMT}
+    {-988840800 1200 1 +0020}
+    {-978301200 0 0 GMT}
+    {-957304800 1200 1 +0020}
+    {-946765200 0 0 GMT}
+    {-936309600 1200 1 +0020}
+    {-915142800 0 0 GMT}
+    {-904773600 1200 1 +0020}
+    {-883606800 0 0 GMT}
+    {-880329600 1800 0 +0030}
+    {-756952200 0 0 GMT}
+    {-610149600 1800 1 +0030}
+    {-599610600 0 0 GMT}
+    {-578613600 1800 1 +0030}
+    {-568074600 0 0 GMT}
+    {-546991200 1800 1 +0030}
+    {-536452200 0 0 GMT}
+    {-515455200 1800 1 +0030}
+    {-504916200 0 0 GMT}
+    {-483919200 1800 1 +0030}
+    {-473380200 0 0 GMT}
+    {-452383200 1800 1 +0030}
+    {-441844200 0 0 GMT}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Algiers b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Algiers
index fe4de22b273..b26d31cee5c 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Algiers
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Algiers
@@ -2,7 +2,7 @@
 
 set TZData(:Africa/Algiers) {
     {-9223372036854775808 732 0 LMT}
-    {-2486679072 561 0 PMT}
+    {-2486592732 561 0 PMT}
     {-1855958961 0 0 WET}
     {-1689814800 3600 1 WEST}
     {-1680397200 0 0 WET}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Casablanca b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Casablanca
index 99027c9db8a..cb607405c87 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Casablanca
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Casablanca
@@ -60,13 +60,13 @@ set TZData(:Africa/Casablanca) {
     {1557021600 0 1 +01}
     {1560045600 3600 0 +01}
     {1587261600 0 1 +01}
-    {1590285600 3600 0 +01}
+    {1590890400 3600 0 +01}
     {1618106400 0 1 +01}
     {1621130400 3600 0 +01}
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682215200 3600 0 +01}
+    {1682820000 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -76,13 +76,13 @@ set TZData(:Africa/Casablanca) {
     {1801965600 0 1 +01}
     {1804989600 3600 0 +01}
     {1832205600 0 1 +01}
-    {1835229600 3600 0 +01}
+    {1835834400 3600 0 +01}
     {1863050400 0 1 +01}
     {1866074400 3600 0 +01}
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927159200 3600 0 +01}
+    {1927764000 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -92,13 +92,13 @@ set TZData(:Africa/Casablanca) {
     {2046304800 0 1 +01}
     {2049933600 3600 0 +01}
     {2077149600 0 1 +01}
-    {2080173600 3600 0 +01}
+    {2080778400 3600 0 +01}
     {2107994400 0 1 +01}
     {2111018400 3600 0 +01}
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172103200 3600 0 +01}
+    {2172708000 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -108,13 +108,13 @@ set TZData(:Africa/Casablanca) {
     {2291248800 0 1 +01}
     {2294877600 3600 0 +01}
     {2322093600 0 1 +01}
-    {2325117600 3600 0 +01}
+    {2325722400 3600 0 +01}
     {2352938400 0 1 +01}
     {2355962400 3600 0 +01}
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417047200 3600 0 +01}
+    {2417652000 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -124,13 +124,13 @@ set TZData(:Africa/Casablanca) {
     {2536192800 0 1 +01}
     {2539821600 3600 0 +01}
     {2567037600 0 1 +01}
-    {2570061600 3600 0 +01}
+    {2570666400 3600 0 +01}
     {2597882400 0 1 +01}
     {2600906400 3600 0 +01}
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2661991200 3600 0 +01}
+    {2662596000 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -140,63 +140,63 @@ set TZData(:Africa/Casablanca) {
     {2781136800 0 1 +01}
     {2784765600 3600 0 +01}
     {2811981600 0 1 +01}
-    {2815005600 3600 0 +01}
+    {2815610400 3600 0 +01}
     {2842826400 0 1 +01}
     {2845850400 3600 0 +01}
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2906935200 3600 0 +01}
+    {2907540000 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
-    {2968020000 3600 0 +01}
+    {2968624800 3600 0 +01}
     {2995840800 0 1 +01}
     {2998864800 3600 0 +01}
     {3026080800 0 1 +01}
     {3029709600 3600 0 +01}
     {3056925600 0 1 +01}
-    {3059949600 3600 0 +01}
+    {3060554400 3600 0 +01}
     {3087770400 0 1 +01}
     {3090794400 3600 0 +01}
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3151879200 3600 0 +01}
+    {3152484000 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
-    {3212964000 3600 0 +01}
+    {3213568800 3600 0 +01}
     {3240784800 0 1 +01}
     {3243808800 3600 0 +01}
     {3271024800 0 1 +01}
     {3274653600 3600 0 +01}
     {3301869600 0 1 +01}
-    {3304893600 3600 0 +01}
+    {3305498400 3600 0 +01}
     {3332714400 0 1 +01}
     {3335738400 3600 0 +01}
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3396823200 3600 0 +01}
+    {3397428000 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
-    {3457908000 3600 0 +01}
+    {3458512800 3600 0 +01}
     {3485728800 0 1 +01}
     {3488752800 3600 0 +01}
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3549837600 3600 0 +01}
+    {3550442400 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3641767200 3600 0 +01}
+    {3642372000 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
-    {3702852000 3600 0 +01}
+    {3703456800 3600 0 +01}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/El_Aaiun b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/El_Aaiun
index 9f021a4fd55..fd3e88f6525 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/El_Aaiun
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/El_Aaiun
@@ -49,13 +49,13 @@ set TZData(:Africa/El_Aaiun) {
     {1557021600 0 1 +01}
     {1560045600 3600 0 +01}
     {1587261600 0 1 +01}
-    {1590285600 3600 0 +01}
+    {1590890400 3600 0 +01}
     {1618106400 0 1 +01}
     {1621130400 3600 0 +01}
     {1648346400 0 1 +01}
     {1651975200 3600 0 +01}
     {1679191200 0 1 +01}
-    {1682215200 3600 0 +01}
+    {1682820000 3600 0 +01}
     {1710036000 0 1 +01}
     {1713060000 3600 0 +01}
     {1740276000 0 1 +01}
@@ -65,13 +65,13 @@ set TZData(:Africa/El_Aaiun) {
     {1801965600 0 1 +01}
     {1804989600 3600 0 +01}
     {1832205600 0 1 +01}
-    {1835229600 3600 0 +01}
+    {1835834400 3600 0 +01}
     {1863050400 0 1 +01}
     {1866074400 3600 0 +01}
     {1893290400 0 1 +01}
     {1896919200 3600 0 +01}
     {1924135200 0 1 +01}
-    {1927159200 3600 0 +01}
+    {1927764000 3600 0 +01}
     {1954980000 0 1 +01}
     {1958004000 3600 0 +01}
     {1985220000 0 1 +01}
@@ -81,13 +81,13 @@ set TZData(:Africa/El_Aaiun) {
     {2046304800 0 1 +01}
     {2049933600 3600 0 +01}
     {2077149600 0 1 +01}
-    {2080173600 3600 0 +01}
+    {2080778400 3600 0 +01}
     {2107994400 0 1 +01}
     {2111018400 3600 0 +01}
     {2138234400 0 1 +01}
     {2141863200 3600 0 +01}
     {2169079200 0 1 +01}
-    {2172103200 3600 0 +01}
+    {2172708000 3600 0 +01}
     {2199924000 0 1 +01}
     {2202948000 3600 0 +01}
     {2230164000 0 1 +01}
@@ -97,13 +97,13 @@ set TZData(:Africa/El_Aaiun) {
     {2291248800 0 1 +01}
     {2294877600 3600 0 +01}
     {2322093600 0 1 +01}
-    {2325117600 3600 0 +01}
+    {2325722400 3600 0 +01}
     {2352938400 0 1 +01}
     {2355962400 3600 0 +01}
     {2383178400 0 1 +01}
     {2386807200 3600 0 +01}
     {2414023200 0 1 +01}
-    {2417047200 3600 0 +01}
+    {2417652000 3600 0 +01}
     {2444868000 0 1 +01}
     {2447892000 3600 0 +01}
     {2475108000 0 1 +01}
@@ -113,13 +113,13 @@ set TZData(:Africa/El_Aaiun) {
     {2536192800 0 1 +01}
     {2539821600 3600 0 +01}
     {2567037600 0 1 +01}
-    {2570061600 3600 0 +01}
+    {2570666400 3600 0 +01}
     {2597882400 0 1 +01}
     {2600906400 3600 0 +01}
     {2628122400 0 1 +01}
     {2631751200 3600 0 +01}
     {2658967200 0 1 +01}
-    {2661991200 3600 0 +01}
+    {2662596000 3600 0 +01}
     {2689812000 0 1 +01}
     {2692836000 3600 0 +01}
     {2720052000 0 1 +01}
@@ -129,63 +129,63 @@ set TZData(:Africa/El_Aaiun) {
     {2781136800 0 1 +01}
     {2784765600 3600 0 +01}
     {2811981600 0 1 +01}
-    {2815005600 3600 0 +01}
+    {2815610400 3600 0 +01}
     {2842826400 0 1 +01}
     {2845850400 3600 0 +01}
     {2873066400 0 1 +01}
     {2876695200 3600 0 +01}
     {2903911200 0 1 +01}
-    {2906935200 3600 0 +01}
+    {2907540000 3600 0 +01}
     {2934756000 0 1 +01}
     {2937780000 3600 0 +01}
     {2964996000 0 1 +01}
-    {2968020000 3600 0 +01}
+    {2968624800 3600 0 +01}
     {2995840800 0 1 +01}
     {2998864800 3600 0 +01}
     {3026080800 0 1 +01}
     {3029709600 3600 0 +01}
     {3056925600 0 1 +01}
-    {3059949600 3600 0 +01}
+    {3060554400 3600 0 +01}
     {3087770400 0 1 +01}
     {3090794400 3600 0 +01}
     {3118010400 0 1 +01}
     {3121639200 3600 0 +01}
     {3148855200 0 1 +01}
-    {3151879200 3600 0 +01}
+    {3152484000 3600 0 +01}
     {3179700000 0 1 +01}
     {3182724000 3600 0 +01}
     {3209940000 0 1 +01}
-    {3212964000 3600 0 +01}
+    {3213568800 3600 0 +01}
     {3240784800 0 1 +01}
     {3243808800 3600 0 +01}
     {3271024800 0 1 +01}
     {3274653600 3600 0 +01}
     {3301869600 0 1 +01}
-    {3304893600 3600 0 +01}
+    {3305498400 3600 0 +01}
     {3332714400 0 1 +01}
     {3335738400 3600 0 +01}
     {3362954400 0 1 +01}
     {3366583200 3600 0 +01}
     {3393799200 0 1 +01}
-    {3396823200 3600 0 +01}
+    {3397428000 3600 0 +01}
     {3424644000 0 1 +01}
     {3427668000 3600 0 +01}
     {3454884000 0 1 +01}
-    {3457908000 3600 0 +01}
+    {3458512800 3600 0 +01}
     {3485728800 0 1 +01}
     {3488752800 3600 0 +01}
     {3515968800 0 1 +01}
     {3519597600 3600 0 +01}
     {3546813600 0 1 +01}
-    {3549837600 3600 0 +01}
+    {3550442400 3600 0 +01}
     {3577658400 0 1 +01}
     {3580682400 3600 0 +01}
     {3607898400 0 1 +01}
     {3611527200 3600 0 +01}
     {3638743200 0 1 +01}
-    {3641767200 3600 0 +01}
+    {3642372000 3600 0 +01}
     {3669588000 0 1 +01}
     {3672612000 3600 0 +01}
     {3699828000 0 1 +01}
-    {3702852000 3600 0 +01}
+    {3703456800 3600 0 +01}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Lagos b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Lagos
index 079572f4730..875066144d7 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Lagos
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Lagos
@@ -1,6 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Africa/Lagos) {
-    {-9223372036854775808 816 0 LMT}
-    {-1588464816 3600 0 WAT}
+    {-9223372036854775808 815 0 LMT}
+    {-2035584815 0 0 GMT}
+    {-1940889600 815 0 LMT}
+    {-1767226415 1800 0 +0030}
+    {-1588465800 3600 0 WAT}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Nairobi b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Nairobi
index 715dc4590e7..b4c3b970728 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Nairobi
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Africa/Nairobi
@@ -2,8 +2,9 @@
 
 set TZData(:Africa/Nairobi) {
     {-9223372036854775808 8836 0 LMT}
-    {-1309746436 10800 0 EAT}
-    {-1262314800 9000 0 +0230}
-    {-946780200 9900 0 +0245}
-    {-315629100 10800 0 EAT}
+    {-1946168836 9000 0 +0230}
+    {-1309746600 10800 0 EAT}
+    {-1261969200 9000 0 +0230}
+    {-1041388200 9900 0 +0245}
+    {-865305900 10800 0 EAT}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Belize b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Belize
index 5b463883de9..3b3f9e4f973 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Belize
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Belize
@@ -51,8 +51,51 @@ set TZData(:America/Belize) {
     {-911759400 -21600 0 CST}
     {-891194400 -19800 1 -0530}
     {-879705000 -21600 0 CST}
-    {-859744800 -19800 1 -0530}
-    {-848255400 -21600 0 CST}
+    {-868212000 -18000 1 CWT}
+    {-769395600 -18000 1 CPT}
+    {-758746800 -21600 0 CST}
+    {-701892000 -19800 1 -0530}
+    {-690402600 -21600 0 CST}
+    {-670442400 -19800 1 -0530}
+    {-658953000 -21600 0 CST}
+    {-638992800 -19800 1 -0530}
+    {-627503400 -21600 0 CST}
+    {-606938400 -19800 1 -0530}
+    {-596053800 -21600 0 CST}
+    {-575488800 -19800 1 -0530}
+    {-564604200 -21600 0 CST}
+    {-544039200 -19800 1 -0530}
+    {-532549800 -21600 0 CST}
+    {-512589600 -19800 1 -0530}
+    {-501100200 -21600 0 CST}
+    {-481140000 -19800 1 -0530}
+    {-469650600 -21600 0 CST}
+    {-449690400 -19800 1 -0530}
+    {-438201000 -21600 0 CST}
+    {-417636000 -19800 1 -0530}
+    {-406751400 -21600 0 CST}
+    {-386186400 -19800 1 -0530}
+    {-375301800 -21600 0 CST}
+    {-354736800 -19800 1 -0530}
+    {-343247400 -21600 0 CST}
+    {-323287200 -19800 1 -0530}
+    {-311797800 -21600 0 CST}
+    {-291837600 -19800 1 -0530}
+    {-280348200 -21600 0 CST}
+    {-259783200 -19800 1 -0530}
+    {-248898600 -21600 0 CST}
+    {-228333600 -19800 1 -0530}
+    {-217449000 -21600 0 CST}
+    {-196884000 -19800 1 -0530}
+    {-185999400 -21600 0 CST}
+    {-165434400 -19800 1 -0530}
+    {-153945000 -21600 0 CST}
+    {-133984800 -19800 1 -0530}
+    {-122495400 -21600 0 CST}
+    {-102535200 -19800 1 -0530}
+    {-91045800 -21600 0 CST}
+    {-70480800 -19800 1 -0530}
+    {-59596200 -21600 0 CST}
     {123919200 -18000 1 CDT}
     {129618000 -21600 0 CST}
     {409039200 -18000 1 CDT}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Dawson b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Dawson
index 8d2b6419030..c8e3f26c7ca 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Dawson
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Dawson
@@ -94,163 +94,5 @@ set TZData(:America/Dawson) {
     {1552212000 -25200 1 PDT}
     {1572771600 -28800 0 PST}
     {1583661600 -25200 1 PDT}
-    {1604221200 -28800 0 PST}
-    {1615716000 -25200 1 PDT}
-    {1636275600 -28800 0 PST}
-    {1647165600 -25200 1 PDT}
-    {1667725200 -28800 0 PST}
-    {1678615200 -25200 1 PDT}
-    {1699174800 -28800 0 PST}
-    {1710064800 -25200 1 PDT}
-    {1730624400 -28800 0 PST}
-    {1741514400 -25200 1 PDT}
-    {1762074000 -28800 0 PST}
-    {1772964000 -25200 1 PDT}
-    {1793523600 -28800 0 PST}
-    {1805018400 -25200 1 PDT}
-    {1825578000 -28800 0 PST}
-    {1836468000 -25200 1 PDT}
-    {1857027600 -28800 0 PST}
-    {1867917600 -25200 1 PDT}
-    {1888477200 -28800 0 PST}
-    {1899367200 -25200 1 PDT}
-    {1919926800 -28800 0 PST}
-    {1930816800 -25200 1 PDT}
-    {1951376400 -28800 0 PST}
-    {1962871200 -25200 1 PDT}
-    {1983430800 -28800 0 PST}
-    {1994320800 -25200 1 PDT}
-    {2014880400 -28800 0 PST}
-    {2025770400 -25200 1 PDT}
-    {2046330000 -28800 0 PST}
-    {2057220000 -25200 1 PDT}
-    {2077779600 -28800 0 PST}
-    {2088669600 -25200 1 PDT}
-    {2109229200 -28800 0 PST}
-    {2120119200 -25200 1 PDT}
-    {2140678800 -28800 0 PST}
-    {2152173600 -25200 1 PDT}
-    {2172733200 -28800 0 PST}
-    {2183623200 -25200 1 PDT}
-    {2204182800 -28800 0 PST}
-    {2215072800 -25200 1 PDT}
-    {2235632400 -28800 0 PST}
-    {2246522400 -25200 1 PDT}
-    {2267082000 -28800 0 PST}
-    {2277972000 -25200 1 PDT}
-    {2298531600 -28800 0 PST}
-    {2309421600 -25200 1 PDT}
-    {2329981200 -28800 0 PST}
-    {2341476000 -25200 1 PDT}
-    {2362035600 -28800 0 PST}
-    {2372925600 -25200 1 PDT}
-    {2393485200 -28800 0 PST}
-    {2404375200 -25200 1 PDT}
-    {2424934800 -28800 0 PST}
-    {2435824800 -25200 1 PDT}
-    {2456384400 -28800 0 PST}
-    {2467274400 -25200 1 PDT}
-    {2487834000 -28800 0 PST}
-    {2499328800 -25200 1 PDT}
-    {2519888400 -28800 0 PST}
-    {2530778400 -25200 1 PDT}
-    {2551338000 -28800 0 PST}
-    {2562228000 -25200 1 PDT}
-    {2582787600 -28800 0 PST}
-    {2593677600 -25200 1 PDT}
-    {2614237200 -28800 0 PST}
-    {2625127200 -25200 1 PDT}
-    {2645686800 -28800 0 PST}
-    {2656576800 -25200 1 PDT}
-    {2677136400 -28800 0 PST}
-    {2688631200 -25200 1 PDT}
-    {2709190800 -28800 0 PST}
-    {2720080800 -25200 1 PDT}
-    {2740640400 -28800 0 PST}
-    {2751530400 -25200 1 PDT}
-    {2772090000 -28800 0 PST}
-    {2782980000 -25200 1 PDT}
-    {2803539600 -28800 0 PST}
-    {2814429600 -25200 1 PDT}
-    {2834989200 -28800 0 PST}
-    {2846484000 -25200 1 PDT}
-    {2867043600 -28800 0 PST}
-    {2877933600 -25200 1 PDT}
-    {2898493200 -28800 0 PST}
-    {2909383200 -25200 1 PDT}
-    {2929942800 -28800 0 PST}
-    {2940832800 -25200 1 PDT}
-    {2961392400 -28800 0 PST}
-    {2972282400 -25200 1 PDT}
-    {2992842000 -28800 0 PST}
-    {3003732000 -25200 1 PDT}
-    {3024291600 -28800 0 PST}
-    {3035786400 -25200 1 PDT}
-    {3056346000 -28800 0 PST}
-    {3067236000 -25200 1 PDT}
-    {3087795600 -28800 0 PST}
-    {3098685600 -25200 1 PDT}
-    {3119245200 -28800 0 PST}
-    {3130135200 -25200 1 PDT}
-    {3150694800 -28800 0 PST}
-    {3161584800 -25200 1 PDT}
-    {3182144400 -28800 0 PST}
-    {3193034400 -25200 1 PDT}
-    {3213594000 -28800 0 PST}
-    {3225088800 -25200 1 PDT}
-    {3245648400 -28800 0 PST}
-    {3256538400 -25200 1 PDT}
-    {3277098000 -28800 0 PST}
-    {3287988000 -25200 1 PDT}
-    {3308547600 -28800 0 PST}
-    {3319437600 -25200 1 PDT}
-    {3339997200 -28800 0 PST}
-    {3350887200 -25200 1 PDT}
-    {3371446800 -28800 0 PST}
-    {3382941600 -25200 1 PDT}
-    {3403501200 -28800 0 PST}
-    {3414391200 -25200 1 PDT}
-    {3434950800 -28800 0 PST}
-    {3445840800 -25200 1 PDT}
-    {3466400400 -28800 0 PST}
-    {3477290400 -25200 1 PDT}
-    {3497850000 -28800 0 PST}
-    {3508740000 -25200 1 PDT}
-    {3529299600 -28800 0 PST}
-    {3540189600 -25200 1 PDT}
-    {3560749200 -28800 0 PST}
-    {3572244000 -25200 1 PDT}
-    {3592803600 -28800 0 PST}
-    {3603693600 -25200 1 PDT}
-    {3624253200 -28800 0 PST}
-    {3635143200 -25200 1 PDT}
-    {3655702800 -28800 0 PST}
-    {3666592800 -25200 1 PDT}
-    {3687152400 -28800 0 PST}
-    {3698042400 -25200 1 PDT}
-    {3718602000 -28800 0 PST}
-    {3730096800 -25200 1 PDT}
-    {3750656400 -28800 0 PST}
-    {3761546400 -25200 1 PDT}
-    {3782106000 -28800 0 PST}
-    {3792996000 -25200 1 PDT}
-    {3813555600 -28800 0 PST}
-    {3824445600 -25200 1 PDT}
-    {3845005200 -28800 0 PST}
-    {3855895200 -25200 1 PDT}
-    {3876454800 -28800 0 PST}
-    {3887344800 -25200 1 PDT}
-    {3907904400 -28800 0 PST}
-    {3919399200 -25200 1 PDT}
-    {3939958800 -28800 0 PST}
-    {3950848800 -25200 1 PDT}
-    {3971408400 -28800 0 PST}
-    {3982298400 -25200 1 PDT}
-    {4002858000 -28800 0 PST}
-    {4013748000 -25200 1 PDT}
-    {4034307600 -28800 0 PST}
-    {4045197600 -25200 1 PDT}
-    {4065757200 -28800 0 PST}
-    {4076647200 -25200 1 PDT}
-    {4097206800 -28800 0 PST}
+    {1604217600 -25200 0 MST}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Godthab b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Godthab
index 3e45f87aad1..8bb7b73887b 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Godthab
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Godthab
@@ -1,246 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Godthab) {
-    {-9223372036854775808 -12416 0 LMT}
-    {-1686083584 -10800 0 -03}
-    {323845200 -7200 0 -02}
-    {338950800 -10800 0 -03}
-    {354675600 -7200 1 -02}
-    {370400400 -10800 0 -03}
-    {386125200 -7200 1 -02}
-    {401850000 -10800 0 -03}
-    {417574800 -7200 1 -02}
-    {433299600 -10800 0 -03}
-    {449024400 -7200 1 -02}
-    {465354000 -10800 0 -03}
-    {481078800 -7200 1 -02}
-    {496803600 -10800 0 -03}
-    {512528400 -7200 1 -02}
-    {528253200 -10800 0 -03}
-    {543978000 -7200 1 -02}
-    {559702800 -10800 0 -03}
-    {575427600 -7200 1 -02}
-    {591152400 -10800 0 -03}
-    {606877200 -7200 1 -02}
-    {622602000 -10800 0 -03}
-    {638326800 -7200 1 -02}
-    {654656400 -10800 0 -03}
-    {670381200 -7200 1 -02}
-    {686106000 -10800 0 -03}
-    {701830800 -7200 1 -02}
-    {717555600 -10800 0 -03}
-    {733280400 -7200 1 -02}
-    {749005200 -10800 0 -03}
-    {764730000 -7200 1 -02}
-    {780454800 -10800 0 -03}
-    {796179600 -7200 1 -02}
-    {811904400 -10800 0 -03}
-    {828234000 -7200 1 -02}
-    {846378000 -10800 0 -03}
-    {859683600 -7200 1 -02}
-    {877827600 -10800 0 -03}
-    {891133200 -7200 1 -02}
-    {909277200 -10800 0 -03}
-    {922582800 -7200 1 -02}
-    {941331600 -10800 0 -03}
-    {954032400 -7200 1 -02}
-    {972781200 -10800 0 -03}
-    {985482000 -7200 1 -02}
-    {1004230800 -10800 0 -03}
-    {1017536400 -7200 1 -02}
-    {1035680400 -10800 0 -03}
-    {1048986000 -7200 1 -02}
-    {1067130000 -10800 0 -03}
-    {1080435600 -7200 1 -02}
-    {1099184400 -10800 0 -03}
-    {1111885200 -7200 1 -02}
-    {1130634000 -10800 0 -03}
-    {1143334800 -7200 1 -02}
-    {1162083600 -10800 0 -03}
-    {1174784400 -7200 1 -02}
-    {1193533200 -10800 0 -03}
-    {1206838800 -7200 1 -02}
-    {1224982800 -10800 0 -03}
-    {1238288400 -7200 1 -02}
-    {1256432400 -10800 0 -03}
-    {1269738000 -7200 1 -02}
-    {1288486800 -10800 0 -03}
-    {1301187600 -7200 1 -02}
-    {1319936400 -10800 0 -03}
-    {1332637200 -7200 1 -02}
-    {1351386000 -10800 0 -03}
-    {1364691600 -7200 1 -02}
-    {1382835600 -10800 0 -03}
-    {1396141200 -7200 1 -02}
-    {1414285200 -10800 0 -03}
-    {1427590800 -7200 1 -02}
-    {1445734800 -10800 0 -03}
-    {1459040400 -7200 1 -02}
-    {1477789200 -10800 0 -03}
-    {1490490000 -7200 1 -02}
-    {1509238800 -10800 0 -03}
-    {1521939600 -7200 1 -02}
-    {1540688400 -10800 0 -03}
-    {1553994000 -7200 1 -02}
-    {1572138000 -10800 0 -03}
-    {1585443600 -7200 1 -02}
-    {1603587600 -10800 0 -03}
-    {1616893200 -7200 1 -02}
-    {1635642000 -10800 0 -03}
-    {1648342800 -7200 1 -02}
-    {1667091600 -10800 0 -03}
-    {1679792400 -7200 1 -02}
-    {1698541200 -10800 0 -03}
-    {1711846800 -7200 1 -02}
-    {1729990800 -10800 0 -03}
-    {1743296400 -7200 1 -02}
-    {1761440400 -10800 0 -03}
-    {1774746000 -7200 1 -02}
-    {1792890000 -10800 0 -03}
-    {1806195600 -7200 1 -02}
-    {1824944400 -10800 0 -03}
-    {1837645200 -7200 1 -02}
-    {1856394000 -10800 0 -03}
-    {1869094800 -7200 1 -02}
-    {1887843600 -10800 0 -03}
-    {1901149200 -7200 1 -02}
-    {1919293200 -10800 0 -03}
-    {1932598800 -7200 1 -02}
-    {1950742800 -10800 0 -03}
-    {1964048400 -7200 1 -02}
-    {1982797200 -10800 0 -03}
-    {1995498000 -7200 1 -02}
-    {2014246800 -10800 0 -03}
-    {2026947600 -7200 1 -02}
-    {2045696400 -10800 0 -03}
-    {2058397200 -7200 1 -02}
-    {2077146000 -10800 0 -03}
-    {2090451600 -7200 1 -02}
-    {2108595600 -10800 0 -03}
-    {2121901200 -7200 1 -02}
-    {2140045200 -10800 0 -03}
-    {2153350800 -7200 1 -02}
-    {2172099600 -10800 0 -03}
-    {2184800400 -7200 1 -02}
-    {2203549200 -10800 0 -03}
-    {2216250000 -7200 1 -02}
-    {2234998800 -10800 0 -03}
-    {2248304400 -7200 1 -02}
-    {2266448400 -10800 0 -03}
-    {2279754000 -7200 1 -02}
-    {2297898000 -10800 0 -03}
-    {2311203600 -7200 1 -02}
-    {2329347600 -10800 0 -03}
-    {2342653200 -7200 1 -02}
-    {2361402000 -10800 0 -03}
-    {2374102800 -7200 1 -02}
-    {2392851600 -10800 0 -03}
-    {2405552400 -7200 1 -02}
-    {2424301200 -10800 0 -03}
-    {2437606800 -7200 1 -02}
-    {2455750800 -10800 0 -03}
-    {2469056400 -7200 1 -02}
-    {2487200400 -10800 0 -03}
-    {2500506000 -7200 1 -02}
-    {2519254800 -10800 0 -03}
-    {2531955600 -7200 1 -02}
-    {2550704400 -10800 0 -03}
-    {2563405200 -7200 1 -02}
-    {2582154000 -10800 0 -03}
-    {2595459600 -7200 1 -02}
-    {2613603600 -10800 0 -03}
-    {2626909200 -7200 1 -02}
-    {2645053200 -10800 0 -03}
-    {2658358800 -7200 1 -02}
-    {2676502800 -10800 0 -03}
-    {2689808400 -7200 1 -02}
-    {2708557200 -10800 0 -03}
-    {2721258000 -7200 1 -02}
-    {2740006800 -10800 0 -03}
-    {2752707600 -7200 1 -02}
-    {2771456400 -10800 0 -03}
-    {2784762000 -7200 1 -02}
-    {2802906000 -10800 0 -03}
-    {2816211600 -7200 1 -02}
-    {2834355600 -10800 0 -03}
-    {2847661200 -7200 1 -02}
-    {2866410000 -10800 0 -03}
-    {2879110800 -7200 1 -02}
-    {2897859600 -10800 0 -03}
-    {2910560400 -7200 1 -02}
-    {2929309200 -10800 0 -03}
-    {2942010000 -7200 1 -02}
-    {2960758800 -10800 0 -03}
-    {2974064400 -7200 1 -02}
-    {2992208400 -10800 0 -03}
-    {3005514000 -7200 1 -02}
-    {3023658000 -10800 0 -03}
-    {3036963600 -7200 1 -02}
-    {3055712400 -10800 0 -03}
-    {3068413200 -7200 1 -02}
-    {3087162000 -10800 0 -03}
-    {3099862800 -7200 1 -02}
-    {3118611600 -10800 0 -03}
-    {3131917200 -7200 1 -02}
-    {3150061200 -10800 0 -03}
-    {3163366800 -7200 1 -02}
-    {3181510800 -10800 0 -03}
-    {3194816400 -7200 1 -02}
-    {3212960400 -10800 0 -03}
-    {3226266000 -7200 1 -02}
-    {3245014800 -10800 0 -03}
-    {3257715600 -7200 1 -02}
-    {3276464400 -10800 0 -03}
-    {3289165200 -7200 1 -02}
-    {3307914000 -10800 0 -03}
-    {3321219600 -7200 1 -02}
-    {3339363600 -10800 0 -03}
-    {3352669200 -7200 1 -02}
-    {3370813200 -10800 0 -03}
-    {3384118800 -7200 1 -02}
-    {3402867600 -10800 0 -03}
-    {3415568400 -7200 1 -02}
-    {3434317200 -10800 0 -03}
-    {3447018000 -7200 1 -02}
-    {3465766800 -10800 0 -03}
-    {3479072400 -7200 1 -02}
-    {3497216400 -10800 0 -03}
-    {3510522000 -7200 1 -02}
-    {3528666000 -10800 0 -03}
-    {3541971600 -7200 1 -02}
-    {3560115600 -10800 0 -03}
-    {3573421200 -7200 1 -02}
-    {3592170000 -10800 0 -03}
-    {3604870800 -7200 1 -02}
-    {3623619600 -10800 0 -03}
-    {3636320400 -7200 1 -02}
-    {3655069200 -10800 0 -03}
-    {3668374800 -7200 1 -02}
-    {3686518800 -10800 0 -03}
-    {3699824400 -7200 1 -02}
-    {3717968400 -10800 0 -03}
-    {3731274000 -7200 1 -02}
-    {3750022800 -10800 0 -03}
-    {3762723600 -7200 1 -02}
-    {3781472400 -10800 0 -03}
-    {3794173200 -7200 1 -02}
-    {3812922000 -10800 0 -03}
-    {3825622800 -7200 1 -02}
-    {3844371600 -10800 0 -03}
-    {3857677200 -7200 1 -02}
-    {3875821200 -10800 0 -03}
-    {3889126800 -7200 1 -02}
-    {3907270800 -10800 0 -03}
-    {3920576400 -7200 1 -02}
-    {3939325200 -10800 0 -03}
-    {3952026000 -7200 1 -02}
-    {3970774800 -10800 0 -03}
-    {3983475600 -7200 1 -02}
-    {4002224400 -10800 0 -03}
-    {4015530000 -7200 1 -02}
-    {4033674000 -10800 0 -03}
-    {4046979600 -7200 1 -02}
-    {4065123600 -10800 0 -03}
-    {4078429200 -7200 1 -02}
-    {4096573200 -10800 0 -03}
+if {![info exists TZData(America/Nuuk)]} {
+    LoadTimeZoneFile America/Nuuk
 }
+set TZData(:America/Godthab) $TZData(:America/Nuuk)
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Grand_Turk b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Grand_Turk
index da5f09bd032..414b0f9f97a 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Grand_Turk
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Grand_Turk
@@ -77,8 +77,7 @@ set TZData(:America/Grand_Turk) {
     {1383458400 -18000 0 EST}
     {1394348400 -14400 1 EDT}
     {1414908000 -18000 0 EST}
-    {1425798000 -14400 1 EDT}
-    {1446361200 -14400 0 AST}
+    {1425798000 -14400 0 AST}
     {1520751600 -14400 0 EDT}
     {1541311200 -18000 0 EST}
     {1552201200 -14400 1 EDT}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nassau b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nassau
index 1c35e93eba8..292c56d67d3 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nassau
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nassau
@@ -3,6 +3,11 @@
 set TZData(:America/Nassau) {
     {-9223372036854775808 -18570 0 LMT}
     {-1825095030 -18000 0 EST}
+    {-873140400 -14400 1 EWT}
+    {-788904000 -18000 0 EST}
+    {-786222000 -14400 1 EWT}
+    {-769395600 -14400 1 EPT}
+    {-763848000 -18000 0 EST}
     {-179341200 -14400 1 EDT}
     {-163620000 -18000 0 EST}
     {-147891600 -14400 1 EDT}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nuuk b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nuuk
new file mode 100644
index 00000000000..8d85a815c4c
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Nuuk
@@ -0,0 +1,246 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:America/Nuuk) {
+    {-9223372036854775808 -12416 0 LMT}
+    {-1686083584 -10800 0 -03}
+    {323845200 -7200 0 -02}
+    {338950800 -10800 0 -03}
+    {354675600 -7200 1 -02}
+    {370400400 -10800 0 -03}
+    {386125200 -7200 1 -02}
+    {401850000 -10800 0 -03}
+    {417574800 -7200 1 -02}
+    {433299600 -10800 0 -03}
+    {449024400 -7200 1 -02}
+    {465354000 -10800 0 -03}
+    {481078800 -7200 1 -02}
+    {496803600 -10800 0 -03}
+    {512528400 -7200 1 -02}
+    {528253200 -10800 0 -03}
+    {543978000 -7200 1 -02}
+    {559702800 -10800 0 -03}
+    {575427600 -7200 1 -02}
+    {591152400 -10800 0 -03}
+    {606877200 -7200 1 -02}
+    {622602000 -10800 0 -03}
+    {638326800 -7200 1 -02}
+    {654656400 -10800 0 -03}
+    {670381200 -7200 1 -02}
+    {686106000 -10800 0 -03}
+    {701830800 -7200 1 -02}
+    {717555600 -10800 0 -03}
+    {733280400 -7200 1 -02}
+    {749005200 -10800 0 -03}
+    {764730000 -7200 1 -02}
+    {780454800 -10800 0 -03}
+    {796179600 -7200 1 -02}
+    {811904400 -10800 0 -03}
+    {828234000 -7200 1 -02}
+    {846378000 -10800 0 -03}
+    {859683600 -7200 1 -02}
+    {877827600 -10800 0 -03}
+    {891133200 -7200 1 -02}
+    {909277200 -10800 0 -03}
+    {922582800 -7200 1 -02}
+    {941331600 -10800 0 -03}
+    {954032400 -7200 1 -02}
+    {972781200 -10800 0 -03}
+    {985482000 -7200 1 -02}
+    {1004230800 -10800 0 -03}
+    {1017536400 -7200 1 -02}
+    {1035680400 -10800 0 -03}
+    {1048986000 -7200 1 -02}
+    {1067130000 -10800 0 -03}
+    {1080435600 -7200 1 -02}
+    {1099184400 -10800 0 -03}
+    {1111885200 -7200 1 -02}
+    {1130634000 -10800 0 -03}
+    {1143334800 -7200 1 -02}
+    {1162083600 -10800 0 -03}
+    {1174784400 -7200 1 -02}
+    {1193533200 -10800 0 -03}
+    {1206838800 -7200 1 -02}
+    {1224982800 -10800 0 -03}
+    {1238288400 -7200 1 -02}
+    {1256432400 -10800 0 -03}
+    {1269738000 -7200 1 -02}
+    {1288486800 -10800 0 -03}
+    {1301187600 -7200 1 -02}
+    {1319936400 -10800 0 -03}
+    {1332637200 -7200 1 -02}
+    {1351386000 -10800 0 -03}
+    {1364691600 -7200 1 -02}
+    {1382835600 -10800 0 -03}
+    {1396141200 -7200 1 -02}
+    {1414285200 -10800 0 -03}
+    {1427590800 -7200 1 -02}
+    {1445734800 -10800 0 -03}
+    {1459040400 -7200 1 -02}
+    {1477789200 -10800 0 -03}
+    {1490490000 -7200 1 -02}
+    {1509238800 -10800 0 -03}
+    {1521939600 -7200 1 -02}
+    {1540688400 -10800 0 -03}
+    {1553994000 -7200 1 -02}
+    {1572138000 -10800 0 -03}
+    {1585443600 -7200 1 -02}
+    {1603587600 -10800 0 -03}
+    {1616893200 -7200 1 -02}
+    {1635642000 -10800 0 -03}
+    {1648342800 -7200 1 -02}
+    {1667091600 -10800 0 -03}
+    {1679792400 -7200 1 -02}
+    {1698541200 -10800 0 -03}
+    {1711846800 -7200 1 -02}
+    {1729990800 -10800 0 -03}
+    {1743296400 -7200 1 -02}
+    {1761440400 -10800 0 -03}
+    {1774746000 -7200 1 -02}
+    {1792890000 -10800 0 -03}
+    {1806195600 -7200 1 -02}
+    {1824944400 -10800 0 -03}
+    {1837645200 -7200 1 -02}
+    {1856394000 -10800 0 -03}
+    {1869094800 -7200 1 -02}
+    {1887843600 -10800 0 -03}
+    {1901149200 -7200 1 -02}
+    {1919293200 -10800 0 -03}
+    {1932598800 -7200 1 -02}
+    {1950742800 -10800 0 -03}
+    {1964048400 -7200 1 -02}
+    {1982797200 -10800 0 -03}
+    {1995498000 -7200 1 -02}
+    {2014246800 -10800 0 -03}
+    {2026947600 -7200 1 -02}
+    {2045696400 -10800 0 -03}
+    {2058397200 -7200 1 -02}
+    {2077146000 -10800 0 -03}
+    {2090451600 -7200 1 -02}
+    {2108595600 -10800 0 -03}
+    {2121901200 -7200 1 -02}
+    {2140045200 -10800 0 -03}
+    {2153350800 -7200 1 -02}
+    {2172099600 -10800 0 -03}
+    {2184800400 -7200 1 -02}
+    {2203549200 -10800 0 -03}
+    {2216250000 -7200 1 -02}
+    {2234998800 -10800 0 -03}
+    {2248304400 -7200 1 -02}
+    {2266448400 -10800 0 -03}
+    {2279754000 -7200 1 -02}
+    {2297898000 -10800 0 -03}
+    {2311203600 -7200 1 -02}
+    {2329347600 -10800 0 -03}
+    {2342653200 -7200 1 -02}
+    {2361402000 -10800 0 -03}
+    {2374102800 -7200 1 -02}
+    {2392851600 -10800 0 -03}
+    {2405552400 -7200 1 -02}
+    {2424301200 -10800 0 -03}
+    {2437606800 -7200 1 -02}
+    {2455750800 -10800 0 -03}
+    {2469056400 -7200 1 -02}
+    {2487200400 -10800 0 -03}
+    {2500506000 -7200 1 -02}
+    {2519254800 -10800 0 -03}
+    {2531955600 -7200 1 -02}
+    {2550704400 -10800 0 -03}
+    {2563405200 -7200 1 -02}
+    {2582154000 -10800 0 -03}
+    {2595459600 -7200 1 -02}
+    {2613603600 -10800 0 -03}
+    {2626909200 -7200 1 -02}
+    {2645053200 -10800 0 -03}
+    {2658358800 -7200 1 -02}
+    {2676502800 -10800 0 -03}
+    {2689808400 -7200 1 -02}
+    {2708557200 -10800 0 -03}
+    {2721258000 -7200 1 -02}
+    {2740006800 -10800 0 -03}
+    {2752707600 -7200 1 -02}
+    {2771456400 -10800 0 -03}
+    {2784762000 -7200 1 -02}
+    {2802906000 -10800 0 -03}
+    {2816211600 -7200 1 -02}
+    {2834355600 -10800 0 -03}
+    {2847661200 -7200 1 -02}
+    {2866410000 -10800 0 -03}
+    {2879110800 -7200 1 -02}
+    {2897859600 -10800 0 -03}
+    {2910560400 -7200 1 -02}
+    {2929309200 -10800 0 -03}
+    {2942010000 -7200 1 -02}
+    {2960758800 -10800 0 -03}
+    {2974064400 -7200 1 -02}
+    {2992208400 -10800 0 -03}
+    {3005514000 -7200 1 -02}
+    {3023658000 -10800 0 -03}
+    {3036963600 -7200 1 -02}
+    {3055712400 -10800 0 -03}
+    {3068413200 -7200 1 -02}
+    {3087162000 -10800 0 -03}
+    {3099862800 -7200 1 -02}
+    {3118611600 -10800 0 -03}
+    {3131917200 -7200 1 -02}
+    {3150061200 -10800 0 -03}
+    {3163366800 -7200 1 -02}
+    {3181510800 -10800 0 -03}
+    {3194816400 -7200 1 -02}
+    {3212960400 -10800 0 -03}
+    {3226266000 -7200 1 -02}
+    {3245014800 -10800 0 -03}
+    {3257715600 -7200 1 -02}
+    {3276464400 -10800 0 -03}
+    {3289165200 -7200 1 -02}
+    {3307914000 -10800 0 -03}
+    {3321219600 -7200 1 -02}
+    {3339363600 -10800 0 -03}
+    {3352669200 -7200 1 -02}
+    {3370813200 -10800 0 -03}
+    {3384118800 -7200 1 -02}
+    {3402867600 -10800 0 -03}
+    {3415568400 -7200 1 -02}
+    {3434317200 -10800 0 -03}
+    {3447018000 -7200 1 -02}
+    {3465766800 -10800 0 -03}
+    {3479072400 -7200 1 -02}
+    {3497216400 -10800 0 -03}
+    {3510522000 -7200 1 -02}
+    {3528666000 -10800 0 -03}
+    {3541971600 -7200 1 -02}
+    {3560115600 -10800 0 -03}
+    {3573421200 -7200 1 -02}
+    {3592170000 -10800 0 -03}
+    {3604870800 -7200 1 -02}
+    {3623619600 -10800 0 -03}
+    {3636320400 -7200 1 -02}
+    {3655069200 -10800 0 -03}
+    {3668374800 -7200 1 -02}
+    {3686518800 -10800 0 -03}
+    {3699824400 -7200 1 -02}
+    {3717968400 -10800 0 -03}
+    {3731274000 -7200 1 -02}
+    {3750022800 -10800 0 -03}
+    {3762723600 -7200 1 -02}
+    {3781472400 -10800 0 -03}
+    {3794173200 -7200 1 -02}
+    {3812922000 -10800 0 -03}
+    {3825622800 -7200 1 -02}
+    {3844371600 -10800 0 -03}
+    {3857677200 -7200 1 -02}
+    {3875821200 -10800 0 -03}
+    {3889126800 -7200 1 -02}
+    {3907270800 -10800 0 -03}
+    {3920576400 -7200 1 -02}
+    {3939325200 -10800 0 -03}
+    {3952026000 -7200 1 -02}
+    {3970774800 -10800 0 -03}
+    {3983475600 -7200 1 -02}
+    {4002224400 -10800 0 -03}
+    {4015530000 -7200 1 -02}
+    {4033674000 -10800 0 -03}
+    {4046979600 -7200 1 -02}
+    {4065123600 -10800 0 -03}
+    {4078429200 -7200 1 -02}
+    {4096573200 -10800 0 -03}
+}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Whitehorse b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Whitehorse
index 1d61093ebf1..498a203a02a 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Whitehorse
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/America/Whitehorse
@@ -94,163 +94,5 @@ set TZData(:America/Whitehorse) {
     {1552212000 -25200 1 PDT}
     {1572771600 -28800 0 PST}
     {1583661600 -25200 1 PDT}
-    {1604221200 -28800 0 PST}
-    {1615716000 -25200 1 PDT}
-    {1636275600 -28800 0 PST}
-    {1647165600 -25200 1 PDT}
-    {1667725200 -28800 0 PST}
-    {1678615200 -25200 1 PDT}
-    {1699174800 -28800 0 PST}
-    {1710064800 -25200 1 PDT}
-    {1730624400 -28800 0 PST}
-    {1741514400 -25200 1 PDT}
-    {1762074000 -28800 0 PST}
-    {1772964000 -25200 1 PDT}
-    {1793523600 -28800 0 PST}
-    {1805018400 -25200 1 PDT}
-    {1825578000 -28800 0 PST}
-    {1836468000 -25200 1 PDT}
-    {1857027600 -28800 0 PST}
-    {1867917600 -25200 1 PDT}
-    {1888477200 -28800 0 PST}
-    {1899367200 -25200 1 PDT}
-    {1919926800 -28800 0 PST}
-    {1930816800 -25200 1 PDT}
-    {1951376400 -28800 0 PST}
-    {1962871200 -25200 1 PDT}
-    {1983430800 -28800 0 PST}
-    {1994320800 -25200 1 PDT}
-    {2014880400 -28800 0 PST}
-    {2025770400 -25200 1 PDT}
-    {2046330000 -28800 0 PST}
-    {2057220000 -25200 1 PDT}
-    {2077779600 -28800 0 PST}
-    {2088669600 -25200 1 PDT}
-    {2109229200 -28800 0 PST}
-    {2120119200 -25200 1 PDT}
-    {2140678800 -28800 0 PST}
-    {2152173600 -25200 1 PDT}
-    {2172733200 -28800 0 PST}
-    {2183623200 -25200 1 PDT}
-    {2204182800 -28800 0 PST}
-    {2215072800 -25200 1 PDT}
-    {2235632400 -28800 0 PST}
-    {2246522400 -25200 1 PDT}
-    {2267082000 -28800 0 PST}
-    {2277972000 -25200 1 PDT}
-    {2298531600 -28800 0 PST}
-    {2309421600 -25200 1 PDT}
-    {2329981200 -28800 0 PST}
-    {2341476000 -25200 1 PDT}
-    {2362035600 -28800 0 PST}
-    {2372925600 -25200 1 PDT}
-    {2393485200 -28800 0 PST}
-    {2404375200 -25200 1 PDT}
-    {2424934800 -28800 0 PST}
-    {2435824800 -25200 1 PDT}
-    {2456384400 -28800 0 PST}
-    {2467274400 -25200 1 PDT}
-    {2487834000 -28800 0 PST}
-    {2499328800 -25200 1 PDT}
-    {2519888400 -28800 0 PST}
-    {2530778400 -25200 1 PDT}
-    {2551338000 -28800 0 PST}
-    {2562228000 -25200 1 PDT}
-    {2582787600 -28800 0 PST}
-    {2593677600 -25200 1 PDT}
-    {2614237200 -28800 0 PST}
-    {2625127200 -25200 1 PDT}
-    {2645686800 -28800 0 PST}
-    {2656576800 -25200 1 PDT}
-    {2677136400 -28800 0 PST}
-    {2688631200 -25200 1 PDT}
-    {2709190800 -28800 0 PST}
-    {2720080800 -25200 1 PDT}
-    {2740640400 -28800 0 PST}
-    {2751530400 -25200 1 PDT}
-    {2772090000 -28800 0 PST}
-    {2782980000 -25200 1 PDT}
-    {2803539600 -28800 0 PST}
-    {2814429600 -25200 1 PDT}
-    {2834989200 -28800 0 PST}
-    {2846484000 -25200 1 PDT}
-    {2867043600 -28800 0 PST}
-    {2877933600 -25200 1 PDT}
-    {2898493200 -28800 0 PST}
-    {2909383200 -25200 1 PDT}
-    {2929942800 -28800 0 PST}
-    {2940832800 -25200 1 PDT}
-    {2961392400 -28800 0 PST}
-    {2972282400 -25200 1 PDT}
-    {2992842000 -28800 0 PST}
-    {3003732000 -25200 1 PDT}
-    {3024291600 -28800 0 PST}
-    {3035786400 -25200 1 PDT}
-    {3056346000 -28800 0 PST}
-    {3067236000 -25200 1 PDT}
-    {3087795600 -28800 0 PST}
-    {3098685600 -25200 1 PDT}
-    {3119245200 -28800 0 PST}
-    {3130135200 -25200 1 PDT}
-    {3150694800 -28800 0 PST}
-    {3161584800 -25200 1 PDT}
-    {3182144400 -28800 0 PST}
-    {3193034400 -25200 1 PDT}
-    {3213594000 -28800 0 PST}
-    {3225088800 -25200 1 PDT}
-    {3245648400 -28800 0 PST}
-    {3256538400 -25200 1 PDT}
-    {3277098000 -28800 0 PST}
-    {3287988000 -25200 1 PDT}
-    {3308547600 -28800 0 PST}
-    {3319437600 -25200 1 PDT}
-    {3339997200 -28800 0 PST}
-    {3350887200 -25200 1 PDT}
-    {3371446800 -28800 0 PST}
-    {3382941600 -25200 1 PDT}
-    {3403501200 -28800 0 PST}
-    {3414391200 -25200 1 PDT}
-    {3434950800 -28800 0 PST}
-    {3445840800 -25200 1 PDT}
-    {3466400400 -28800 0 PST}
-    {3477290400 -25200 1 PDT}
-    {3497850000 -28800 0 PST}
-    {3508740000 -25200 1 PDT}
-    {3529299600 -28800 0 PST}
-    {3540189600 -25200 1 PDT}
-    {3560749200 -28800 0 PST}
-    {3572244000 -25200 1 PDT}
-    {3592803600 -28800 0 PST}
-    {3603693600 -25200 1 PDT}
-    {3624253200 -28800 0 PST}
-    {3635143200 -25200 1 PDT}
-    {3655702800 -28800 0 PST}
-    {3666592800 -25200 1 PDT}
-    {3687152400 -28800 0 PST}
-    {3698042400 -25200 1 PDT}
-    {3718602000 -28800 0 PST}
-    {3730096800 -25200 1 PDT}
-    {3750656400 -28800 0 PST}
-    {3761546400 -25200 1 PDT}
-    {3782106000 -28800 0 PST}
-    {3792996000 -25200 1 PDT}
-    {3813555600 -28800 0 PST}
-    {3824445600 -25200 1 PDT}
-    {3845005200 -28800 0 PST}
-    {3855895200 -25200 1 PDT}
-    {3876454800 -28800 0 PST}
-    {3887344800 -25200 1 PDT}
-    {3907904400 -28800 0 PST}
-    {3919399200 -25200 1 PDT}
-    {3939958800 -28800 0 PST}
-    {3950848800 -25200 1 PDT}
-    {3971408400 -28800 0 PST}
-    {3982298400 -25200 1 PDT}
-    {4002858000 -28800 0 PST}
-    {4013748000 -25200 1 PDT}
-    {4034307600 -28800 0 PST}
-    {4045197600 -25200 1 PDT}
-    {4065757200 -28800 0 PST}
-    {4076647200 -25200 1 PDT}
-    {4097206800 -28800 0 PST}
+    {1604217600 -25200 0 MST}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Casey b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Casey
index aa374803de8..56935e328ec 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Casey
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Casey
@@ -9,4 +9,9 @@ set TZData(:Antarctica/Casey) {
     {1329843600 28800 0 +08}
     {1477065600 39600 0 +11}
     {1520701200 28800 0 +08}
+    {1538856000 39600 0 +11}
+    {1552752000 28800 0 +08}
+    {1570129200 39600 0 +11}
+    {1583596800 28800 0 +08}
+    {1601740860 39600 0 +11}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Macquarie b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Macquarie
index 60bf7a6db2b..82b2b9ff621 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Macquarie
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Antarctica/Macquarie
@@ -5,7 +5,7 @@ set TZData(:Antarctica/Macquarie) {
     {-2214259200 36000 0 AEST}
     {-1680508800 39600 1 AEDT}
     {-1669892400 39600 0 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-1665388800 36000 0 AEST}
     {-1601719200 0 0 -00}
     {-94730400 36000 0 AEST}
     {-71136000 39600 1 AEDT}
@@ -93,5 +93,184 @@ set TZData(:Antarctica/Macquarie) {
     {1223136000 39600 1 AEDT}
     {1238860800 36000 0 AEST}
     {1254585600 39600 1 AEDT}
-    {1270310400 39600 0 +11}
+    {1262264400 39600 1 AEDT}
+    {1293800400 39600 0 AEST}
+    {1301760000 36000 0 AEST}
+    {1317484800 39600 1 AEDT}
+    {1333209600 36000 0 AEST}
+    {1349539200 39600 1 AEDT}
+    {1365264000 36000 0 AEST}
+    {1380988800 39600 1 AEDT}
+    {1396713600 36000 0 AEST}
+    {1412438400 39600 1 AEDT}
+    {1428163200 36000 0 AEST}
+    {1443888000 39600 1 AEDT}
+    {1459612800 36000 0 AEST}
+    {1475337600 39600 1 AEDT}
+    {1491062400 36000 0 AEST}
+    {1506787200 39600 1 AEDT}
+    {1522512000 36000 0 AEST}
+    {1538841600 39600 1 AEDT}
+    {1554566400 36000 0 AEST}
+    {1570291200 39600 1 AEDT}
+    {1586016000 36000 0 AEST}
+    {1601740800 39600 1 AEDT}
+    {1617465600 36000 0 AEST}
+    {1633190400 39600 1 AEDT}
+    {1648915200 36000 0 AEST}
+    {1664640000 39600 1 AEDT}
+    {1680364800 36000 0 AEST}
+    {1696089600 39600 1 AEDT}
+    {1712419200 36000 0 AEST}
+    {1728144000 39600 1 AEDT}
+    {1743868800 36000 0 AEST}
+    {1759593600 39600 1 AEDT}
+    {1775318400 36000 0 AEST}
+    {1791043200 39600 1 AEDT}
+    {1806768000 36000 0 AEST}
+    {1822492800 39600 1 AEDT}
+    {1838217600 36000 0 AEST}
+    {1853942400 39600 1 AEDT}
+    {1869667200 36000 0 AEST}
+    {1885996800 39600 1 AEDT}
+    {1901721600 36000 0 AEST}
+    {1917446400 39600 1 AEDT}
+    {1933171200 36000 0 AEST}
+    {1948896000 39600 1 AEDT}
+    {1964620800 36000 0 AEST}
+    {1980345600 39600 1 AEDT}
+    {1996070400 36000 0 AEST}
+    {2011795200 39600 1 AEDT}
+    {2027520000 36000 0 AEST}
+    {2043244800 39600 1 AEDT}
+    {2058969600 36000 0 AEST}
+    {2075299200 39600 1 AEDT}
+    {2091024000 36000 0 AEST}
+    {2106748800 39600 1 AEDT}
+    {2122473600 36000 0 AEST}
+    {2138198400 39600 1 AEDT}
+    {2153923200 36000 0 AEST}
+    {2169648000 39600 1 AEDT}
+    {2185372800 36000 0 AEST}
+    {2201097600 39600 1 AEDT}
+    {2216822400 36000 0 AEST}
+    {2233152000 39600 1 AEDT}
+    {2248876800 36000 0 AEST}
+    {2264601600 39600 1 AEDT}
+    {2280326400 36000 0 AEST}
+    {2296051200 39600 1 AEDT}
+    {2311776000 36000 0 AEST}
+    {2327500800 39600 1 AEDT}
+    {2343225600 36000 0 AEST}
+    {2358950400 39600 1 AEDT}
+    {2374675200 36000 0 AEST}
+    {2390400000 39600 1 AEDT}
+    {2406124800 36000 0 AEST}
+    {2422454400 39600 1 AEDT}
+    {2438179200 36000 0 AEST}
+    {2453904000 39600 1 AEDT}
+    {2469628800 36000 0 AEST}
+    {2485353600 39600 1 AEDT}
+    {2501078400 36000 0 AEST}
+    {2516803200 39600 1 AEDT}
+    {2532528000 36000 0 AEST}
+    {2548252800 39600 1 AEDT}
+    {2563977600 36000 0 AEST}
+    {2579702400 39600 1 AEDT}
+    {2596032000 36000 0 AEST}
+    {2611756800 39600 1 AEDT}
+    {2627481600 36000 0 AEST}
+    {2643206400 39600 1 AEDT}
+    {2658931200 36000 0 AEST}
+    {2674656000 39600 1 AEDT}
+    {2690380800 36000 0 AEST}
+    {2706105600 39600 1 AEDT}
+    {2721830400 36000 0 AEST}
+    {2737555200 39600 1 AEDT}
+    {2753280000 36000 0 AEST}
+    {2769609600 39600 1 AEDT}
+    {2785334400 36000 0 AEST}
+    {2801059200 39600 1 AEDT}
+    {2816784000 36000 0 AEST}
+    {2832508800 39600 1 AEDT}
+    {2848233600 36000 0 AEST}
+    {2863958400 39600 1 AEDT}
+    {2879683200 36000 0 AEST}
+    {2895408000 39600 1 AEDT}
+    {2911132800 36000 0 AEST}
+    {2926857600 39600 1 AEDT}
+    {2942582400 36000 0 AEST}
+    {2958912000 39600 1 AEDT}
+    {2974636800 36000 0 AEST}
+    {2990361600 39600 1 AEDT}
+    {3006086400 36000 0 AEST}
+    {3021811200 39600 1 AEDT}
+    {3037536000 36000 0 AEST}
+    {3053260800 39600 1 AEDT}
+    {3068985600 36000 0 AEST}
+    {3084710400 39600 1 AEDT}
+    {3100435200 36000 0 AEST}
+    {3116764800 39600 1 AEDT}
+    {3132489600 36000 0 AEST}
+    {3148214400 39600 1 AEDT}
+    {3163939200 36000 0 AEST}
+    {3179664000 39600 1 AEDT}
+    {3195388800 36000 0 AEST}
+    {3211113600 39600 1 AEDT}
+    {3226838400 36000 0 AEST}
+    {3242563200 39600 1 AEDT}
+    {3258288000 36000 0 AEST}
+    {3274012800 39600 1 AEDT}
+    {3289737600 36000 0 AEST}
+    {3306067200 39600 1 AEDT}
+    {3321792000 36000 0 AEST}
+    {3337516800 39600 1 AEDT}
+    {3353241600 36000 0 AEST}
+    {3368966400 39600 1 AEDT}
+    {3384691200 36000 0 AEST}
+    {3400416000 39600 1 AEDT}
+    {3416140800 36000 0 AEST}
+    {3431865600 39600 1 AEDT}
+    {3447590400 36000 0 AEST}
+    {3463315200 39600 1 AEDT}
+    {3479644800 36000 0 AEST}
+    {3495369600 39600 1 AEDT}
+    {3511094400 36000 0 AEST}
+    {3526819200 39600 1 AEDT}
+    {3542544000 36000 0 AEST}
+    {3558268800 39600 1 AEDT}
+    {3573993600 36000 0 AEST}
+    {3589718400 39600 1 AEDT}
+    {3605443200 36000 0 AEST}
+    {3621168000 39600 1 AEDT}
+    {3636892800 36000 0 AEST}
+    {3653222400 39600 1 AEDT}
+    {3668947200 36000 0 AEST}
+    {3684672000 39600 1 AEDT}
+    {3700396800 36000 0 AEST}
+    {3716121600 39600 1 AEDT}
+    {3731846400 36000 0 AEST}
+    {3747571200 39600 1 AEDT}
+    {3763296000 36000 0 AEST}
+    {3779020800 39600 1 AEDT}
+    {3794745600 36000 0 AEST}
+    {3810470400 39600 1 AEDT}
+    {3826195200 36000 0 AEST}
+    {3842524800 39600 1 AEDT}
+    {3858249600 36000 0 AEST}
+    {3873974400 39600 1 AEDT}
+    {3889699200 36000 0 AEST}
+    {3905424000 39600 1 AEDT}
+    {3921148800 36000 0 AEST}
+    {3936873600 39600 1 AEDT}
+    {3952598400 36000 0 AEST}
+    {3968323200 39600 1 AEDT}
+    {3984048000 36000 0 AEST}
+    {4000377600 39600 1 AEDT}
+    {4016102400 36000 0 AEST}
+    {4031827200 39600 1 AEDT}
+    {4047552000 36000 0 AEST}
+    {4063276800 39600 1 AEDT}
+    {4079001600 36000 0 AEST}
+    {4094726400 39600 1 AEDT}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Gaza b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Gaza
index 9b73dccc2b8..95523c967ac 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Gaza
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Gaza
@@ -3,16 +3,18 @@
 set TZData(:Asia/Gaza) {
     {-9223372036854775808 8272 0 LMT}
     {-2185409872 7200 0 EEST}
-    {-933645600 10800 1 EEST}
-    {-857358000 7200 0 EEST}
+    {-933638400 10800 1 EEST}
+    {-923097600 7200 0 EEST}
+    {-919036800 10800 1 EEST}
+    {-857347200 7200 0 EEST}
     {-844300800 10800 1 EEST}
-    {-825822000 7200 0 EEST}
-    {-812685600 10800 1 EEST}
-    {-794199600 7200 0 EEST}
-    {-779853600 10800 1 EEST}
-    {-762656400 7200 0 EEST}
+    {-825811200 7200 0 EEST}
+    {-812678400 10800 1 EEST}
+    {-794188800 7200 0 EEST}
+    {-779846400 10800 1 EEST}
+    {-762652800 7200 0 EEST}
     {-748310400 10800 1 EEST}
-    {-731127600 7200 0 EEST}
+    {-731116800 7200 0 EEST}
     {-682653600 7200 0 EET}
     {-399088800 10800 1 EEST}
     {-386650800 7200 0 EET}
@@ -40,12 +42,12 @@ set TZData(:Asia/Gaza) {
     {150843600 7200 0 IST}
     {167176800 10800 1 IDT}
     {178664400 7200 0 IST}
-    {334015200 10800 1 IDT}
-    {337644000 7200 0 IST}
-    {452556000 10800 1 IDT}
-    {462232800 7200 0 IST}
+    {334101600 10800 1 IDT}
+    {337730400 7200 0 IST}
+    {452642400 10800 1 IDT}
+    {462319200 7200 0 IST}
     {482277600 10800 1 IDT}
-    {495579600 7200 0 IST}
+    {494370000 7200 0 IST}
     {516751200 10800 1 IDT}
     {526424400 7200 0 IST}
     {545436000 10800 1 IDT}
@@ -110,7 +112,7 @@ set TZData(:Asia/Gaza) {
     {1395957600 10800 1 EEST}
     {1414098000 7200 0 EET}
     {1427493600 10800 1 EEST}
-    {1445547600 7200 0 EET}
+    {1445551200 7200 0 EET}
     {1458946800 10800 1 EEST}
     {1477692000 7200 0 EET}
     {1490396400 10800 1 EEST}
@@ -118,165 +120,165 @@ set TZData(:Asia/Gaza) {
     {1521846000 10800 1 EEST}
     {1540591200 7200 0 EET}
     {1553810400 10800 1 EEST}
-    {1572040800 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1604095200 7200 0 EET}
-    {1616709600 10800 1 EEST}
+    {1572037200 7200 0 EET}
+    {1585346400 10800 1 EEST}
+    {1603490400 7200 0 EET}
+    {1616796000 10800 1 EEST}
     {1635544800 7200 0 EET}
-    {1648159200 10800 1 EEST}
+    {1648245600 10800 1 EEST}
     {1666994400 7200 0 EET}
-    {1680213600 10800 1 EEST}
+    {1679695200 10800 1 EEST}
     {1698444000 7200 0 EET}
-    {1711663200 10800 1 EEST}
+    {1711749600 10800 1 EEST}
     {1729893600 7200 0 EET}
-    {1743112800 10800 1 EEST}
+    {1743199200 10800 1 EEST}
     {1761343200 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793397600 7200 0 EET}
-    {1806012000 10800 1 EEST}
+    {1774648800 10800 1 EEST}
+    {1792792800 7200 0 EET}
+    {1806098400 10800 1 EEST}
     {1824847200 7200 0 EET}
-    {1838066400 10800 1 EEST}
+    {1837548000 10800 1 EEST}
     {1856296800 7200 0 EET}
-    {1869516000 10800 1 EEST}
+    {1868997600 10800 1 EEST}
     {1887746400 7200 0 EET}
-    {1900965600 10800 1 EEST}
+    {1901052000 10800 1 EEST}
     {1919196000 7200 0 EET}
-    {1932415200 10800 1 EEST}
+    {1932501600 10800 1 EEST}
     {1950645600 7200 0 EET}
-    {1963864800 10800 1 EEST}
+    {1963951200 10800 1 EEST}
     {1982700000 7200 0 EET}
-    {1995314400 10800 1 EEST}
+    {1995400800 10800 1 EEST}
     {2014149600 7200 0 EET}
-    {2027368800 10800 1 EEST}
+    {2026850400 10800 1 EEST}
     {2045599200 7200 0 EET}
-    {2058818400 10800 1 EEST}
+    {2058300000 10800 1 EEST}
     {2077048800 7200 0 EET}
-    {2090268000 10800 1 EEST}
+    {2090354400 10800 1 EEST}
     {2108498400 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140552800 7200 0 EET}
-    {2153167200 10800 1 EEST}
+    {2121804000 10800 1 EEST}
+    {2139948000 7200 0 EET}
+    {2153253600 10800 1 EEST}
     {2172002400 7200 0 EET}
-    {2184616800 10800 1 EEST}
+    {2184703200 10800 1 EEST}
     {2203452000 7200 0 EET}
-    {2216671200 10800 1 EEST}
+    {2216152800 10800 1 EEST}
     {2234901600 7200 0 EET}
-    {2248120800 10800 1 EEST}
+    {2248207200 10800 1 EEST}
     {2266351200 7200 0 EET}
-    {2279570400 10800 1 EEST}
+    {2279656800 10800 1 EEST}
     {2297800800 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329855200 7200 0 EET}
-    {2342469600 10800 1 EEST}
+    {2311106400 10800 1 EEST}
+    {2329250400 7200 0 EET}
+    {2342556000 10800 1 EEST}
     {2361304800 7200 0 EET}
-    {2374524000 10800 1 EEST}
+    {2374005600 10800 1 EEST}
     {2392754400 7200 0 EET}
-    {2405973600 10800 1 EEST}
+    {2405455200 10800 1 EEST}
     {2424204000 7200 0 EET}
-    {2437423200 10800 1 EEST}
+    {2437509600 10800 1 EEST}
     {2455653600 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487708000 7200 0 EET}
-    {2500322400 10800 1 EEST}
+    {2468959200 10800 1 EEST}
+    {2487103200 7200 0 EET}
+    {2500408800 10800 1 EEST}
     {2519157600 7200 0 EET}
-    {2531772000 10800 1 EEST}
+    {2531858400 10800 1 EEST}
     {2550607200 7200 0 EET}
-    {2563826400 10800 1 EEST}
+    {2563308000 10800 1 EEST}
     {2582056800 7200 0 EET}
-    {2595276000 10800 1 EEST}
+    {2595362400 10800 1 EEST}
     {2613506400 7200 0 EET}
-    {2626725600 10800 1 EEST}
+    {2626812000 10800 1 EEST}
     {2644956000 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2677010400 7200 0 EET}
-    {2689624800 10800 1 EEST}
+    {2658261600 10800 1 EEST}
+    {2676405600 7200 0 EET}
+    {2689711200 10800 1 EEST}
     {2708460000 7200 0 EET}
-    {2721679200 10800 1 EEST}
+    {2721160800 10800 1 EEST}
     {2739909600 7200 0 EET}
-    {2753128800 10800 1 EEST}
+    {2752610400 10800 1 EEST}
     {2771359200 7200 0 EET}
-    {2784578400 10800 1 EEST}
+    {2784664800 10800 1 EEST}
     {2802808800 7200 0 EET}
-    {2816028000 10800 1 EEST}
+    {2816114400 10800 1 EEST}
     {2834258400 7200 0 EET}
-    {2847477600 10800 1 EEST}
+    {2847564000 10800 1 EEST}
     {2866312800 7200 0 EET}
-    {2878927200 10800 1 EEST}
+    {2879013600 10800 1 EEST}
     {2897762400 7200 0 EET}
-    {2910981600 10800 1 EEST}
+    {2910463200 10800 1 EEST}
     {2929212000 7200 0 EET}
-    {2942431200 10800 1 EEST}
+    {2941912800 10800 1 EEST}
     {2960661600 7200 0 EET}
-    {2973880800 10800 1 EEST}
+    {2973967200 10800 1 EEST}
     {2992111200 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024165600 7200 0 EET}
-    {3036780000 10800 1 EEST}
+    {3005416800 10800 1 EEST}
+    {3023560800 7200 0 EET}
+    {3036866400 10800 1 EEST}
     {3055615200 7200 0 EET}
-    {3068229600 10800 1 EEST}
+    {3068316000 10800 1 EEST}
     {3087064800 7200 0 EET}
-    {3100284000 10800 1 EEST}
+    {3099765600 10800 1 EEST}
     {3118514400 7200 0 EET}
-    {3131733600 10800 1 EEST}
+    {3131820000 10800 1 EEST}
     {3149964000 7200 0 EET}
-    {3163183200 10800 1 EEST}
+    {3163269600 10800 1 EEST}
     {3181413600 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213468000 7200 0 EET}
-    {3226082400 10800 1 EEST}
+    {3194719200 10800 1 EEST}
+    {3212863200 7200 0 EET}
+    {3226168800 10800 1 EEST}
     {3244917600 7200 0 EET}
-    {3258136800 10800 1 EEST}
+    {3257618400 10800 1 EEST}
     {3276367200 7200 0 EET}
-    {3289586400 10800 1 EEST}
+    {3289068000 10800 1 EEST}
     {3307816800 7200 0 EET}
-    {3321036000 10800 1 EEST}
+    {3321122400 10800 1 EEST}
     {3339266400 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371320800 7200 0 EET}
-    {3383935200 10800 1 EEST}
+    {3352572000 10800 1 EEST}
+    {3370716000 7200 0 EET}
+    {3384021600 10800 1 EEST}
     {3402770400 7200 0 EET}
-    {3415384800 10800 1 EEST}
+    {3415471200 10800 1 EEST}
     {3434220000 7200 0 EET}
-    {3447439200 10800 1 EEST}
+    {3446920800 10800 1 EEST}
     {3465669600 7200 0 EET}
-    {3478888800 10800 1 EEST}
+    {3478975200 10800 1 EEST}
     {3497119200 7200 0 EET}
-    {3510338400 10800 1 EEST}
+    {3510424800 10800 1 EEST}
     {3528568800 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560623200 7200 0 EET}
-    {3573237600 10800 1 EEST}
+    {3541874400 10800 1 EEST}
+    {3560018400 7200 0 EET}
+    {3573324000 10800 1 EEST}
     {3592072800 7200 0 EET}
-    {3605292000 10800 1 EEST}
+    {3604773600 10800 1 EEST}
     {3623522400 7200 0 EET}
-    {3636741600 10800 1 EEST}
+    {3636223200 10800 1 EEST}
     {3654972000 7200 0 EET}
-    {3668191200 10800 1 EEST}
+    {3668277600 10800 1 EEST}
     {3686421600 7200 0 EET}
-    {3699640800 10800 1 EEST}
+    {3699727200 10800 1 EEST}
     {3717871200 7200 0 EET}
-    {3731090400 10800 1 EEST}
+    {3731176800 10800 1 EEST}
     {3749925600 7200 0 EET}
-    {3762540000 10800 1 EEST}
+    {3762626400 10800 1 EEST}
     {3781375200 7200 0 EET}
-    {3794594400 10800 1 EEST}
+    {3794076000 10800 1 EEST}
     {3812824800 7200 0 EET}
-    {3826044000 10800 1 EEST}
+    {3825525600 10800 1 EEST}
     {3844274400 7200 0 EET}
-    {3857493600 10800 1 EEST}
+    {3857580000 10800 1 EEST}
     {3875724000 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907778400 7200 0 EET}
-    {3920392800 10800 1 EEST}
+    {3889029600 10800 1 EEST}
+    {3907173600 7200 0 EET}
+    {3920479200 10800 1 EEST}
     {3939228000 7200 0 EET}
-    {3951842400 10800 1 EEST}
+    {3951928800 10800 1 EEST}
     {3970677600 7200 0 EET}
-    {3983896800 10800 1 EEST}
+    {3983378400 10800 1 EEST}
     {4002127200 7200 0 EET}
-    {4015346400 10800 1 EEST}
+    {4015432800 10800 1 EEST}
     {4033576800 7200 0 EET}
-    {4046796000 10800 1 EEST}
+    {4046882400 10800 1 EEST}
     {4065026400 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4097080800 7200 0 EET}
+    {4078332000 10800 1 EEST}
+    {4096476000 7200 0 EET}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Hebron b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Hebron
index fe8f7e17e98..3fdcd653725 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Hebron
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Hebron
@@ -3,16 +3,18 @@
 set TZData(:Asia/Hebron) {
     {-9223372036854775808 8423 0 LMT}
     {-2185410023 7200 0 EEST}
-    {-933645600 10800 1 EEST}
-    {-857358000 7200 0 EEST}
+    {-933638400 10800 1 EEST}
+    {-923097600 7200 0 EEST}
+    {-919036800 10800 1 EEST}
+    {-857347200 7200 0 EEST}
     {-844300800 10800 1 EEST}
-    {-825822000 7200 0 EEST}
-    {-812685600 10800 1 EEST}
-    {-794199600 7200 0 EEST}
-    {-779853600 10800 1 EEST}
-    {-762656400 7200 0 EEST}
+    {-825811200 7200 0 EEST}
+    {-812678400 10800 1 EEST}
+    {-794188800 7200 0 EEST}
+    {-779846400 10800 1 EEST}
+    {-762652800 7200 0 EEST}
     {-748310400 10800 1 EEST}
-    {-731127600 7200 0 EEST}
+    {-731116800 7200 0 EEST}
     {-682653600 7200 0 EET}
     {-399088800 10800 1 EEST}
     {-386650800 7200 0 EET}
@@ -40,12 +42,12 @@ set TZData(:Asia/Hebron) {
     {150843600 7200 0 IST}
     {167176800 10800 1 IDT}
     {178664400 7200 0 IST}
-    {334015200 10800 1 IDT}
-    {337644000 7200 0 IST}
-    {452556000 10800 1 IDT}
-    {462232800 7200 0 IST}
+    {334101600 10800 1 IDT}
+    {337730400 7200 0 IST}
+    {452642400 10800 1 IDT}
+    {462319200 7200 0 IST}
     {482277600 10800 1 IDT}
-    {495579600 7200 0 IST}
+    {494370000 7200 0 IST}
     {516751200 10800 1 IDT}
     {526424400 7200 0 IST}
     {545436000 10800 1 IDT}
@@ -109,7 +111,7 @@ set TZData(:Asia/Hebron) {
     {1395957600 10800 1 EEST}
     {1414098000 7200 0 EET}
     {1427493600 10800 1 EEST}
-    {1445547600 7200 0 EET}
+    {1445551200 7200 0 EET}
     {1458946800 10800 1 EEST}
     {1477692000 7200 0 EET}
     {1490396400 10800 1 EEST}
@@ -117,165 +119,165 @@ set TZData(:Asia/Hebron) {
     {1521846000 10800 1 EEST}
     {1540591200 7200 0 EET}
     {1553810400 10800 1 EEST}
-    {1572040800 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1604095200 7200 0 EET}
-    {1616709600 10800 1 EEST}
+    {1572037200 7200 0 EET}
+    {1585346400 10800 1 EEST}
+    {1603490400 7200 0 EET}
+    {1616796000 10800 1 EEST}
     {1635544800 7200 0 EET}
-    {1648159200 10800 1 EEST}
+    {1648245600 10800 1 EEST}
     {1666994400 7200 0 EET}
-    {1680213600 10800 1 EEST}
+    {1679695200 10800 1 EEST}
     {1698444000 7200 0 EET}
-    {1711663200 10800 1 EEST}
+    {1711749600 10800 1 EEST}
     {1729893600 7200 0 EET}
-    {1743112800 10800 1 EEST}
+    {1743199200 10800 1 EEST}
     {1761343200 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793397600 7200 0 EET}
-    {1806012000 10800 1 EEST}
+    {1774648800 10800 1 EEST}
+    {1792792800 7200 0 EET}
+    {1806098400 10800 1 EEST}
     {1824847200 7200 0 EET}
-    {1838066400 10800 1 EEST}
+    {1837548000 10800 1 EEST}
     {1856296800 7200 0 EET}
-    {1869516000 10800 1 EEST}
+    {1868997600 10800 1 EEST}
     {1887746400 7200 0 EET}
-    {1900965600 10800 1 EEST}
+    {1901052000 10800 1 EEST}
     {1919196000 7200 0 EET}
-    {1932415200 10800 1 EEST}
+    {1932501600 10800 1 EEST}
     {1950645600 7200 0 EET}
-    {1963864800 10800 1 EEST}
+    {1963951200 10800 1 EEST}
     {1982700000 7200 0 EET}
-    {1995314400 10800 1 EEST}
+    {1995400800 10800 1 EEST}
     {2014149600 7200 0 EET}
-    {2027368800 10800 1 EEST}
+    {2026850400 10800 1 EEST}
     {2045599200 7200 0 EET}
-    {2058818400 10800 1 EEST}
+    {2058300000 10800 1 EEST}
     {2077048800 7200 0 EET}
-    {2090268000 10800 1 EEST}
+    {2090354400 10800 1 EEST}
     {2108498400 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140552800 7200 0 EET}
-    {2153167200 10800 1 EEST}
+    {2121804000 10800 1 EEST}
+    {2139948000 7200 0 EET}
+    {2153253600 10800 1 EEST}
     {2172002400 7200 0 EET}
-    {2184616800 10800 1 EEST}
+    {2184703200 10800 1 EEST}
     {2203452000 7200 0 EET}
-    {2216671200 10800 1 EEST}
+    {2216152800 10800 1 EEST}
     {2234901600 7200 0 EET}
-    {2248120800 10800 1 EEST}
+    {2248207200 10800 1 EEST}
     {2266351200 7200 0 EET}
-    {2279570400 10800 1 EEST}
+    {2279656800 10800 1 EEST}
     {2297800800 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329855200 7200 0 EET}
-    {2342469600 10800 1 EEST}
+    {2311106400 10800 1 EEST}
+    {2329250400 7200 0 EET}
+    {2342556000 10800 1 EEST}
     {2361304800 7200 0 EET}
-    {2374524000 10800 1 EEST}
+    {2374005600 10800 1 EEST}
     {2392754400 7200 0 EET}
-    {2405973600 10800 1 EEST}
+    {2405455200 10800 1 EEST}
     {2424204000 7200 0 EET}
-    {2437423200 10800 1 EEST}
+    {2437509600 10800 1 EEST}
     {2455653600 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487708000 7200 0 EET}
-    {2500322400 10800 1 EEST}
+    {2468959200 10800 1 EEST}
+    {2487103200 7200 0 EET}
+    {2500408800 10800 1 EEST}
     {2519157600 7200 0 EET}
-    {2531772000 10800 1 EEST}
+    {2531858400 10800 1 EEST}
     {2550607200 7200 0 EET}
-    {2563826400 10800 1 EEST}
+    {2563308000 10800 1 EEST}
     {2582056800 7200 0 EET}
-    {2595276000 10800 1 EEST}
+    {2595362400 10800 1 EEST}
     {2613506400 7200 0 EET}
-    {2626725600 10800 1 EEST}
+    {2626812000 10800 1 EEST}
     {2644956000 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2677010400 7200 0 EET}
-    {2689624800 10800 1 EEST}
+    {2658261600 10800 1 EEST}
+    {2676405600 7200 0 EET}
+    {2689711200 10800 1 EEST}
     {2708460000 7200 0 EET}
-    {2721679200 10800 1 EEST}
+    {2721160800 10800 1 EEST}
     {2739909600 7200 0 EET}
-    {2753128800 10800 1 EEST}
+    {2752610400 10800 1 EEST}
     {2771359200 7200 0 EET}
-    {2784578400 10800 1 EEST}
+    {2784664800 10800 1 EEST}
     {2802808800 7200 0 EET}
-    {2816028000 10800 1 EEST}
+    {2816114400 10800 1 EEST}
     {2834258400 7200 0 EET}
-    {2847477600 10800 1 EEST}
+    {2847564000 10800 1 EEST}
     {2866312800 7200 0 EET}
-    {2878927200 10800 1 EEST}
+    {2879013600 10800 1 EEST}
     {2897762400 7200 0 EET}
-    {2910981600 10800 1 EEST}
+    {2910463200 10800 1 EEST}
     {2929212000 7200 0 EET}
-    {2942431200 10800 1 EEST}
+    {2941912800 10800 1 EEST}
     {2960661600 7200 0 EET}
-    {2973880800 10800 1 EEST}
+    {2973967200 10800 1 EEST}
     {2992111200 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024165600 7200 0 EET}
-    {3036780000 10800 1 EEST}
+    {3005416800 10800 1 EEST}
+    {3023560800 7200 0 EET}
+    {3036866400 10800 1 EEST}
     {3055615200 7200 0 EET}
-    {3068229600 10800 1 EEST}
+    {3068316000 10800 1 EEST}
     {3087064800 7200 0 EET}
-    {3100284000 10800 1 EEST}
+    {3099765600 10800 1 EEST}
     {3118514400 7200 0 EET}
-    {3131733600 10800 1 EEST}
+    {3131820000 10800 1 EEST}
     {3149964000 7200 0 EET}
-    {3163183200 10800 1 EEST}
+    {3163269600 10800 1 EEST}
     {3181413600 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213468000 7200 0 EET}
-    {3226082400 10800 1 EEST}
+    {3194719200 10800 1 EEST}
+    {3212863200 7200 0 EET}
+    {3226168800 10800 1 EEST}
     {3244917600 7200 0 EET}
-    {3258136800 10800 1 EEST}
+    {3257618400 10800 1 EEST}
     {3276367200 7200 0 EET}
-    {3289586400 10800 1 EEST}
+    {3289068000 10800 1 EEST}
     {3307816800 7200 0 EET}
-    {3321036000 10800 1 EEST}
+    {3321122400 10800 1 EEST}
     {3339266400 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371320800 7200 0 EET}
-    {3383935200 10800 1 EEST}
+    {3352572000 10800 1 EEST}
+    {3370716000 7200 0 EET}
+    {3384021600 10800 1 EEST}
     {3402770400 7200 0 EET}
-    {3415384800 10800 1 EEST}
+    {3415471200 10800 1 EEST}
     {3434220000 7200 0 EET}
-    {3447439200 10800 1 EEST}
+    {3446920800 10800 1 EEST}
     {3465669600 7200 0 EET}
-    {3478888800 10800 1 EEST}
+    {3478975200 10800 1 EEST}
     {3497119200 7200 0 EET}
-    {3510338400 10800 1 EEST}
+    {3510424800 10800 1 EEST}
     {3528568800 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560623200 7200 0 EET}
-    {3573237600 10800 1 EEST}
+    {3541874400 10800 1 EEST}
+    {3560018400 7200 0 EET}
+    {3573324000 10800 1 EEST}
     {3592072800 7200 0 EET}
-    {3605292000 10800 1 EEST}
+    {3604773600 10800 1 EEST}
     {3623522400 7200 0 EET}
-    {3636741600 10800 1 EEST}
+    {3636223200 10800 1 EEST}
     {3654972000 7200 0 EET}
-    {3668191200 10800 1 EEST}
+    {3668277600 10800 1 EEST}
     {3686421600 7200 0 EET}
-    {3699640800 10800 1 EEST}
+    {3699727200 10800 1 EEST}
     {3717871200 7200 0 EET}
-    {3731090400 10800 1 EEST}
+    {3731176800 10800 1 EEST}
     {3749925600 7200 0 EET}
-    {3762540000 10800 1 EEST}
+    {3762626400 10800 1 EEST}
     {3781375200 7200 0 EET}
-    {3794594400 10800 1 EEST}
+    {3794076000 10800 1 EEST}
     {3812824800 7200 0 EET}
-    {3826044000 10800 1 EEST}
+    {3825525600 10800 1 EEST}
     {3844274400 7200 0 EET}
-    {3857493600 10800 1 EEST}
+    {3857580000 10800 1 EEST}
     {3875724000 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907778400 7200 0 EET}
-    {3920392800 10800 1 EEST}
+    {3889029600 10800 1 EEST}
+    {3907173600 7200 0 EET}
+    {3920479200 10800 1 EEST}
     {3939228000 7200 0 EET}
-    {3951842400 10800 1 EEST}
+    {3951928800 10800 1 EEST}
     {3970677600 7200 0 EET}
-    {3983896800 10800 1 EEST}
+    {3983378400 10800 1 EEST}
     {4002127200 7200 0 EET}
-    {4015346400 10800 1 EEST}
+    {4015432800 10800 1 EEST}
     {4033576800 7200 0 EET}
-    {4046796000 10800 1 EEST}
+    {4046882400 10800 1 EEST}
     {4065026400 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4097080800 7200 0 EET}
+    {4078332000 10800 1 EEST}
+    {4096476000 7200 0 EET}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Jerusalem b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Jerusalem
index e1e84f48a93..596deb324c7 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Jerusalem
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Jerusalem
@@ -4,47 +4,49 @@ set TZData(:Asia/Jerusalem) {
     {-9223372036854775808 8454 0 LMT}
     {-2840149254 8440 0 JMT}
     {-1641003640 7200 0 IST}
-    {-933645600 10800 1 IDT}
-    {-857358000 7200 0 IST}
+    {-933638400 10800 1 IDT}
+    {-923097600 7200 0 IST}
+    {-919036800 10800 1 IDT}
+    {-857347200 7200 0 IST}
     {-844300800 10800 1 IDT}
-    {-825822000 7200 0 IST}
-    {-812685600 10800 1 IDT}
-    {-794199600 7200 0 IST}
-    {-779853600 10800 1 IDT}
-    {-762656400 7200 0 IST}
+    {-825811200 7200 0 IST}
+    {-812678400 10800 1 IDT}
+    {-794188800 7200 0 IST}
+    {-779846400 10800 1 IDT}
+    {-762652800 7200 0 IST}
     {-748310400 10800 1 IDT}
-    {-731127600 7200 0 IST}
-    {-681962400 14400 1 IDDT}
-    {-673243200 10800 1 IDT}
-    {-667962000 7200 0 IST}
-    {-652327200 10800 1 IDT}
-    {-636426000 7200 0 IST}
-    {-622087200 10800 1 IDT}
+    {-731116800 7200 0 IST}
+    {-681955200 14400 1 IDDT}
+    {-673228800 10800 1 IDT}
+    {-667958400 7200 0 IST}
+    {-652320000 10800 1 IDT}
+    {-636422400 7200 0 IST}
+    {-622080000 10800 1 IDT}
     {-608947200 7200 0 IST}
-    {-591847200 10800 1 IDT}
+    {-591840000 10800 1 IDT}
     {-572486400 7200 0 IST}
     {-558576000 10800 1 IDT}
     {-542851200 7200 0 IST}
     {-527731200 10800 1 IDT}
     {-514425600 7200 0 IST}
-    {-490845600 10800 1 IDT}
-    {-482986800 7200 0 IST}
-    {-459475200 10800 1 IDT}
-    {-451537200 7200 0 IST}
-    {-428551200 10800 1 IDT}
+    {-490838400 10800 1 IDT}
+    {-482976000 7200 0 IST}
+    {-459388800 10800 1 IDT}
+    {-451526400 7200 0 IST}
+    {-428544000 10800 1 IDT}
     {-418262400 7200 0 IST}
-    {-400032000 10800 1 IDT}
-    {-387428400 7200 0 IST}
+    {-400118400 10800 1 IDT}
+    {-387417600 7200 0 IST}
     {142380000 10800 1 IDT}
     {150843600 7200 0 IST}
     {167176800 10800 1 IDT}
     {178664400 7200 0 IST}
-    {334015200 10800 1 IDT}
-    {337644000 7200 0 IST}
-    {452556000 10800 1 IDT}
-    {462232800 7200 0 IST}
+    {334101600 10800 1 IDT}
+    {337730400 7200 0 IST}
+    {452642400 10800 1 IDT}
+    {462319200 7200 0 IST}
     {482277600 10800 1 IDT}
-    {495579600 7200 0 IST}
+    {494370000 7200 0 IST}
     {516751200 10800 1 IDT}
     {526424400 7200 0 IST}
     {545436000 10800 1 IDT}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Shanghai b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Shanghai
index 66bc4339bcd..0fcf802e9aa 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Shanghai
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Asia/Shanghai
@@ -3,6 +3,8 @@
 set TZData(:Asia/Shanghai) {
     {-9223372036854775808 29143 0 LMT}
     {-2177481943 28800 0 CST}
+    {-1600675200 32400 1 CDT}
+    {-1585904400 28800 0 CST}
     {-933667200 32400 1 CDT}
     {-922093200 28800 0 CST}
     {-908870400 32400 1 CDT}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Atlantic/Bermuda b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Atlantic/Bermuda
index 2d4d98358c2..40ab5d7cd5c 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Atlantic/Bermuda
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Atlantic/Bermuda
@@ -2,7 +2,34 @@
 
 set TZData(:Atlantic/Bermuda) {
     {-9223372036854775808 -15558 0 LMT}
-    {-1262281242 -14400 0 AST}
+    {-2524506042 -15558 0 BMT}
+    {-1664307642 -11958 1 BMT}
+    {-1648932042 -15558 0 BMT}
+    {-1632080442 -11958 1 BMT}
+    {-1618692042 -15558 0 BST}
+    {-1262281242 -14400 0 AT}
+    {-882727200 -10800 1 ADT}
+    {-858538800 -14400 0 AST}
+    {-845229600 -10800 1 ADT}
+    {-825879600 -14400 0 AST}
+    {-814384800 -10800 1 ADT}
+    {-793825200 -14400 0 AST}
+    {-782935200 -10800 1 ADT}
+    {-762375600 -14400 0 AST}
+    {-713988000 -10800 1 ADT}
+    {-703710000 -14400 0 AST}
+    {-681933600 -10800 1 ADT}
+    {-672865200 -14400 0 AST}
+    {-650484000 -10800 1 ADT}
+    {-641415600 -14400 0 AST}
+    {-618429600 -10800 1 ADT}
+    {-609966000 -14400 0 AST}
+    {-586980000 -10800 1 ADT}
+    {-578516400 -14400 0 AST}
+    {-555530400 -10800 1 ADT}
+    {-546462000 -14400 0 AST}
+    {-429127200 -10800 1 ADT}
+    {-415825200 -14400 0 AST}
     {136360800 -10800 0 ADT}
     {152082000 -14400 0 AST}
     {167810400 -10800 1 ADT}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Adelaide b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Adelaide
index 7e1b04ea04a..5f7c1a44946 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Adelaide
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Adelaide
@@ -4,14 +4,14 @@ set TZData(:Australia/Adelaide) {
     {-9223372036854775808 33260 0 LMT}
     {-2364110060 32400 0 ACST}
     {-2230189200 34200 0 ACST}
-    {-1672565340 37800 1 ACDT}
-    {-1665390600 34200 0 ACST}
+    {-1672558200 37800 1 ACDT}
+    {-1665387000 34200 0 ACST}
     {-883639800 37800 1 ACDT}
-    {-876126600 34200 0 ACST}
+    {-876123000 34200 0 ACST}
     {-860398200 37800 1 ACDT}
-    {-844677000 34200 0 ACST}
+    {-844673400 34200 0 ACST}
     {-828343800 37800 1 ACDT}
-    {-813227400 34200 0 ACST}
+    {-813223800 34200 0 ACST}
     {31501800 34200 0 ACST}
     {57688200 37800 1 ACDT}
     {67969800 34200 0 ACST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Brisbane b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Brisbane
index 8422ae6a13c..325313a0d5c 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Brisbane
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Brisbane
@@ -3,14 +3,14 @@
 set TZData(:Australia/Brisbane) {
     {-9223372036854775808 36728 0 LMT}
     {-2366791928 36000 0 AEST}
-    {-1672567140 39600 1 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-1672560000 39600 1 AEDT}
+    {-1665388800 36000 0 AEST}
     {-883641600 39600 1 AEDT}
-    {-876128400 36000 0 AEST}
+    {-876124800 36000 0 AEST}
     {-860400000 39600 1 AEDT}
-    {-844678800 36000 0 AEST}
+    {-844675200 36000 0 AEST}
     {-828345600 39600 1 AEDT}
-    {-813229200 36000 0 AEST}
+    {-813225600 36000 0 AEST}
     {31500000 36000 0 AEST}
     {57686400 39600 1 AEDT}
     {67968000 36000 0 AEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Broken_Hill b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Broken_Hill
index c42806139b7..2534b70729c 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Broken_Hill
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Broken_Hill
@@ -5,14 +5,14 @@ set TZData(:Australia/Broken_Hill) {
     {-2364110748 36000 0 AEST}
     {-2314951200 32400 0 ACST}
     {-2230189200 34200 0 ACST}
-    {-1672565340 37800 1 ACDT}
-    {-1665390600 34200 0 ACST}
+    {-1672558200 37800 1 ACDT}
+    {-1665387000 34200 0 ACST}
     {-883639800 37800 1 ACDT}
-    {-876126600 34200 0 ACST}
+    {-876123000 34200 0 ACST}
     {-860398200 37800 1 ACDT}
-    {-844677000 34200 0 ACST}
+    {-844673400 34200 0 ACST}
     {-828343800 37800 1 ACDT}
-    {-813227400 34200 0 ACST}
+    {-813223800 34200 0 ACST}
     {31501800 34200 0 ACST}
     {57688200 37800 1 ACDT}
     {67969800 34200 0 ACST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Currie b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Currie
index 936327b2f20..3315aa34ba6 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Currie
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Currie
@@ -1,273 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Australia/Currie) {
-    {-9223372036854775808 34528 0 LMT}
-    {-2345794528 36000 0 AEST}
-    {-1680508800 39600 1 AEDT}
-    {-1669892400 39600 0 AEDT}
-    {-1665392400 36000 0 AEST}
-    {-883641600 39600 1 AEDT}
-    {-876128400 36000 0 AEST}
-    {-860400000 39600 1 AEDT}
-    {-844678800 36000 0 AEST}
-    {-828345600 39600 1 AEDT}
-    {-813229200 36000 0 AEST}
-    {47138400 36000 0 AEST}
-    {57686400 39600 1 AEDT}
-    {67968000 36000 0 AEST}
-    {89136000 39600 1 AEDT}
-    {100022400 36000 0 AEST}
-    {120585600 39600 1 AEDT}
-    {131472000 36000 0 AEST}
-    {152035200 39600 1 AEDT}
-    {162921600 36000 0 AEST}
-    {183484800 39600 1 AEDT}
-    {194976000 36000 0 AEST}
-    {215539200 39600 1 AEDT}
-    {226425600 36000 0 AEST}
-    {246988800 39600 1 AEDT}
-    {257875200 36000 0 AEST}
-    {278438400 39600 1 AEDT}
-    {289324800 36000 0 AEST}
-    {309888000 39600 1 AEDT}
-    {320774400 36000 0 AEST}
-    {341337600 39600 1 AEDT}
-    {352224000 36000 0 AEST}
-    {372787200 39600 1 AEDT}
-    {386092800 36000 0 AEST}
-    {404841600 39600 1 AEDT}
-    {417542400 36000 0 AEST}
-    {436291200 39600 1 AEDT}
-    {447177600 36000 0 AEST}
-    {467740800 39600 1 AEDT}
-    {478627200 36000 0 AEST}
-    {499190400 39600 1 AEDT}
-    {510076800 36000 0 AEST}
-    {530035200 39600 1 AEDT}
-    {542736000 36000 0 AEST}
-    {562089600 39600 1 AEDT}
-    {574790400 36000 0 AEST}
-    {594144000 39600 1 AEDT}
-    {606240000 36000 0 AEST}
-    {625593600 39600 1 AEDT}
-    {637689600 36000 0 AEST}
-    {657043200 39600 1 AEDT}
-    {670348800 36000 0 AEST}
-    {686678400 39600 1 AEDT}
-    {701798400 36000 0 AEST}
-    {718128000 39600 1 AEDT}
-    {733248000 36000 0 AEST}
-    {749577600 39600 1 AEDT}
-    {764697600 36000 0 AEST}
-    {781027200 39600 1 AEDT}
-    {796147200 36000 0 AEST}
-    {812476800 39600 1 AEDT}
-    {828201600 36000 0 AEST}
-    {844531200 39600 1 AEDT}
-    {859651200 36000 0 AEST}
-    {875980800 39600 1 AEDT}
-    {891100800 36000 0 AEST}
-    {907430400 39600 1 AEDT}
-    {922550400 36000 0 AEST}
-    {938880000 39600 1 AEDT}
-    {954000000 36000 0 AEST}
-    {967305600 39600 1 AEDT}
-    {985449600 36000 0 AEST}
-    {1002384000 39600 1 AEDT}
-    {1017504000 36000 0 AEST}
-    {1033833600 39600 1 AEDT}
-    {1048953600 36000 0 AEST}
-    {1065283200 39600 1 AEDT}
-    {1080403200 36000 0 AEST}
-    {1096732800 39600 1 AEDT}
-    {1111852800 36000 0 AEST}
-    {1128182400 39600 1 AEDT}
-    {1143907200 36000 0 AEST}
-    {1159632000 39600 1 AEDT}
-    {1174752000 36000 0 AEST}
-    {1191686400 39600 1 AEDT}
-    {1207411200 36000 0 AEST}
-    {1223136000 39600 1 AEDT}
-    {1238860800 36000 0 AEST}
-    {1254585600 39600 1 AEDT}
-    {1270310400 36000 0 AEST}
-    {1286035200 39600 1 AEDT}
-    {1301760000 36000 0 AEST}
-    {1317484800 39600 1 AEDT}
-    {1333209600 36000 0 AEST}
-    {1349539200 39600 1 AEDT}
-    {1365264000 36000 0 AEST}
-    {1380988800 39600 1 AEDT}
-    {1396713600 36000 0 AEST}
-    {1412438400 39600 1 AEDT}
-    {1428163200 36000 0 AEST}
-    {1443888000 39600 1 AEDT}
-    {1459612800 36000 0 AEST}
-    {1475337600 39600 1 AEDT}
-    {1491062400 36000 0 AEST}
-    {1506787200 39600 1 AEDT}
-    {1522512000 36000 0 AEST}
-    {1538841600 39600 1 AEDT}
-    {1554566400 36000 0 AEST}
-    {1570291200 39600 1 AEDT}
-    {1586016000 36000 0 AEST}
-    {1601740800 39600 1 AEDT}
-    {1617465600 36000 0 AEST}
-    {1633190400 39600 1 AEDT}
-    {1648915200 36000 0 AEST}
-    {1664640000 39600 1 AEDT}
-    {1680364800 36000 0 AEST}
-    {1696089600 39600 1 AEDT}
-    {1712419200 36000 0 AEST}
-    {1728144000 39600 1 AEDT}
-    {1743868800 36000 0 AEST}
-    {1759593600 39600 1 AEDT}
-    {1775318400 36000 0 AEST}
-    {1791043200 39600 1 AEDT}
-    {1806768000 36000 0 AEST}
-    {1822492800 39600 1 AEDT}
-    {1838217600 36000 0 AEST}
-    {1853942400 39600 1 AEDT}
-    {1869667200 36000 0 AEST}
-    {1885996800 39600 1 AEDT}
-    {1901721600 36000 0 AEST}
-    {1917446400 39600 1 AEDT}
-    {1933171200 36000 0 AEST}
-    {1948896000 39600 1 AEDT}
-    {1964620800 36000 0 AEST}
-    {1980345600 39600 1 AEDT}
-    {1996070400 36000 0 AEST}
-    {2011795200 39600 1 AEDT}
-    {2027520000 36000 0 AEST}
-    {2043244800 39600 1 AEDT}
-    {2058969600 36000 0 AEST}
-    {2075299200 39600 1 AEDT}
-    {2091024000 36000 0 AEST}
-    {2106748800 39600 1 AEDT}
-    {2122473600 36000 0 AEST}
-    {2138198400 39600 1 AEDT}
-    {2153923200 36000 0 AEST}
-    {2169648000 39600 1 AEDT}
-    {2185372800 36000 0 AEST}
-    {2201097600 39600 1 AEDT}
-    {2216822400 36000 0 AEST}
-    {2233152000 39600 1 AEDT}
-    {2248876800 36000 0 AEST}
-    {2264601600 39600 1 AEDT}
-    {2280326400 36000 0 AEST}
-    {2296051200 39600 1 AEDT}
-    {2311776000 36000 0 AEST}
-    {2327500800 39600 1 AEDT}
-    {2343225600 36000 0 AEST}
-    {2358950400 39600 1 AEDT}
-    {2374675200 36000 0 AEST}
-    {2390400000 39600 1 AEDT}
-    {2406124800 36000 0 AEST}
-    {2422454400 39600 1 AEDT}
-    {2438179200 36000 0 AEST}
-    {2453904000 39600 1 AEDT}
-    {2469628800 36000 0 AEST}
-    {2485353600 39600 1 AEDT}
-    {2501078400 36000 0 AEST}
-    {2516803200 39600 1 AEDT}
-    {2532528000 36000 0 AEST}
-    {2548252800 39600 1 AEDT}
-    {2563977600 36000 0 AEST}
-    {2579702400 39600 1 AEDT}
-    {2596032000 36000 0 AEST}
-    {2611756800 39600 1 AEDT}
-    {2627481600 36000 0 AEST}
-    {2643206400 39600 1 AEDT}
-    {2658931200 36000 0 AEST}
-    {2674656000 39600 1 AEDT}
-    {2690380800 36000 0 AEST}
-    {2706105600 39600 1 AEDT}
-    {2721830400 36000 0 AEST}
-    {2737555200 39600 1 AEDT}
-    {2753280000 36000 0 AEST}
-    {2769609600 39600 1 AEDT}
-    {2785334400 36000 0 AEST}
-    {2801059200 39600 1 AEDT}
-    {2816784000 36000 0 AEST}
-    {2832508800 39600 1 AEDT}
-    {2848233600 36000 0 AEST}
-    {2863958400 39600 1 AEDT}
-    {2879683200 36000 0 AEST}
-    {2895408000 39600 1 AEDT}
-    {2911132800 36000 0 AEST}
-    {2926857600 39600 1 AEDT}
-    {2942582400 36000 0 AEST}
-    {2958912000 39600 1 AEDT}
-    {2974636800 36000 0 AEST}
-    {2990361600 39600 1 AEDT}
-    {3006086400 36000 0 AEST}
-    {3021811200 39600 1 AEDT}
-    {3037536000 36000 0 AEST}
-    {3053260800 39600 1 AEDT}
-    {3068985600 36000 0 AEST}
-    {3084710400 39600 1 AEDT}
-    {3100435200 36000 0 AEST}
-    {3116764800 39600 1 AEDT}
-    {3132489600 36000 0 AEST}
-    {3148214400 39600 1 AEDT}
-    {3163939200 36000 0 AEST}
-    {3179664000 39600 1 AEDT}
-    {3195388800 36000 0 AEST}
-    {3211113600 39600 1 AEDT}
-    {3226838400 36000 0 AEST}
-    {3242563200 39600 1 AEDT}
-    {3258288000 36000 0 AEST}
-    {3274012800 39600 1 AEDT}
-    {3289737600 36000 0 AEST}
-    {3306067200 39600 1 AEDT}
-    {3321792000 36000 0 AEST}
-    {3337516800 39600 1 AEDT}
-    {3353241600 36000 0 AEST}
-    {3368966400 39600 1 AEDT}
-    {3384691200 36000 0 AEST}
-    {3400416000 39600 1 AEDT}
-    {3416140800 36000 0 AEST}
-    {3431865600 39600 1 AEDT}
-    {3447590400 36000 0 AEST}
-    {3463315200 39600 1 AEDT}
-    {3479644800 36000 0 AEST}
-    {3495369600 39600 1 AEDT}
-    {3511094400 36000 0 AEST}
-    {3526819200 39600 1 AEDT}
-    {3542544000 36000 0 AEST}
-    {3558268800 39600 1 AEDT}
-    {3573993600 36000 0 AEST}
-    {3589718400 39600 1 AEDT}
-    {3605443200 36000 0 AEST}
-    {3621168000 39600 1 AEDT}
-    {3636892800 36000 0 AEST}
-    {3653222400 39600 1 AEDT}
-    {3668947200 36000 0 AEST}
-    {3684672000 39600 1 AEDT}
-    {3700396800 36000 0 AEST}
-    {3716121600 39600 1 AEDT}
-    {3731846400 36000 0 AEST}
-    {3747571200 39600 1 AEDT}
-    {3763296000 36000 0 AEST}
-    {3779020800 39600 1 AEDT}
-    {3794745600 36000 0 AEST}
-    {3810470400 39600 1 AEDT}
-    {3826195200 36000 0 AEST}
-    {3842524800 39600 1 AEDT}
-    {3858249600 36000 0 AEST}
-    {3873974400 39600 1 AEDT}
-    {3889699200 36000 0 AEST}
-    {3905424000 39600 1 AEDT}
-    {3921148800 36000 0 AEST}
-    {3936873600 39600 1 AEDT}
-    {3952598400 36000 0 AEST}
-    {3968323200 39600 1 AEDT}
-    {3984048000 36000 0 AEST}
-    {4000377600 39600 1 AEDT}
-    {4016102400 36000 0 AEST}
-    {4031827200 39600 1 AEDT}
-    {4047552000 36000 0 AEST}
-    {4063276800 39600 1 AEDT}
-    {4079001600 36000 0 AEST}
-    {4094726400 39600 1 AEDT}
+if {![info exists TZData(Australia/Hobart)]} {
+    LoadTimeZoneFile Australia/Hobart
 }
+set TZData(:Australia/Currie) $TZData(:Australia/Hobart)
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Darwin b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Darwin
index e77605d1719..13f13ee25a7 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Darwin
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Darwin
@@ -4,12 +4,12 @@ set TZData(:Australia/Darwin) {
     {-9223372036854775808 31400 0 LMT}
     {-2364108200 32400 0 ACST}
     {-2230189200 34200 0 ACST}
-    {-1672565340 37800 1 ACDT}
-    {-1665390600 34200 0 ACST}
+    {-1672558200 37800 1 ACDT}
+    {-1665387000 34200 0 ACST}
     {-883639800 37800 1 ACDT}
-    {-876126600 34200 0 ACST}
+    {-876123000 34200 0 ACST}
     {-860398200 37800 1 ACDT}
-    {-844677000 34200 0 ACST}
+    {-844673400 34200 0 ACST}
     {-828343800 37800 1 ACDT}
-    {-813227400 34200 0 ACST}
+    {-813223800 34200 0 ACST}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Eucla b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Eucla
index 80089801150..1d81a3d5e17 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Eucla
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Eucla
@@ -3,12 +3,12 @@
 set TZData(:Australia/Eucla) {
     {-9223372036854775808 30928 0 LMT}
     {-2337928528 31500 0 +0945}
-    {-1672562640 35100 1 +0945}
-    {-1665387900 31500 0 +0945}
+    {-1672555500 35100 1 +0945}
+    {-1665384300 31500 0 +0945}
     {-883637100 35100 1 +0945}
-    {-876123900 31500 0 +0945}
+    {-876120300 31500 0 +0945}
     {-860395500 35100 1 +0945}
-    {-844674300 31500 0 +0945}
+    {-844670700 31500 0 +0945}
     {-836473500 35100 0 +0945}
     {152039700 35100 1 +0945}
     {162926100 31500 0 +0945}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Hobart b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Hobart
index bf5adf0b65a..5ff675e3eb2 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Hobart
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Hobart
@@ -4,14 +4,18 @@ set TZData(:Australia/Hobart) {
     {-9223372036854775808 35356 0 LMT}
     {-2345795356 36000 0 AEST}
     {-1680508800 39600 1 AEDT}
-    {-1669892400 39600 0 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-1665388800 36000 0 AEST}
+    {-1646640000 39600 1 AEDT}
+    {-1635753600 36000 0 AEST}
+    {-1615190400 39600 1 AEDT}
+    {-1604304000 36000 0 AEST}
+    {-1583920800 36000 0 AEST}
     {-883641600 39600 1 AEDT}
-    {-876128400 36000 0 AEST}
+    {-876124800 36000 0 AEST}
     {-860400000 39600 1 AEDT}
-    {-844678800 36000 0 AEST}
+    {-844675200 36000 0 AEST}
     {-828345600 39600 1 AEDT}
-    {-813229200 36000 0 AEST}
+    {-813225600 36000 0 AEST}
     {-94730400 36000 0 AEST}
     {-71136000 39600 1 AEDT}
     {-55411200 36000 0 AEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Lindeman b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Lindeman
index 91ad0a6be73..1be69628975 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Lindeman
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Lindeman
@@ -3,14 +3,14 @@
 set TZData(:Australia/Lindeman) {
     {-9223372036854775808 35756 0 LMT}
     {-2366790956 36000 0 AEST}
-    {-1672567140 39600 1 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-1672560000 39600 1 AEDT}
+    {-1665388800 36000 0 AEST}
     {-883641600 39600 1 AEDT}
-    {-876128400 36000 0 AEST}
+    {-876124800 36000 0 AEST}
     {-860400000 39600 1 AEDT}
-    {-844678800 36000 0 AEST}
+    {-844675200 36000 0 AEST}
     {-828345600 39600 1 AEDT}
-    {-813229200 36000 0 AEST}
+    {-813225600 36000 0 AEST}
     {31500000 36000 0 AEST}
     {57686400 39600 1 AEDT}
     {67968000 36000 0 AEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Melbourne b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Melbourne
index 81777dfe26d..77e9067fe2e 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Melbourne
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Melbourne
@@ -3,14 +3,14 @@
 set TZData(:Australia/Melbourne) {
     {-9223372036854775808 34792 0 LMT}
     {-2364111592 36000 0 AEST}
-    {-1672567140 39600 1 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-1672560000 39600 1 AEDT}
+    {-1665388800 36000 0 AEST}
     {-883641600 39600 1 AEDT}
-    {-876128400 36000 0 AEST}
+    {-876124800 36000 0 AEST}
     {-860400000 39600 1 AEDT}
-    {-844678800 36000 0 AEST}
+    {-844675200 36000 0 AEST}
     {-828345600 39600 1 AEDT}
-    {-813229200 36000 0 AEST}
+    {-813225600 36000 0 AEST}
     {31500000 36000 0 AEST}
     {57686400 39600 1 AEDT}
     {67968000 36000 0 AEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Perth b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Perth
index 6ccbca8209b..4ed3cba6ec3 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Perth
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Perth
@@ -3,12 +3,12 @@
 set TZData(:Australia/Perth) {
     {-9223372036854775808 27804 0 LMT}
     {-2337925404 28800 0 AWST}
-    {-1672559940 32400 1 AWDT}
-    {-1665385200 28800 0 AWST}
+    {-1672552800 32400 1 AWDT}
+    {-1665381600 28800 0 AWST}
     {-883634400 32400 1 AWDT}
-    {-876121200 28800 0 AWST}
+    {-876117600 28800 0 AWST}
     {-860392800 32400 1 AWDT}
-    {-844671600 28800 0 AWST}
+    {-844668000 28800 0 AWST}
     {-836470800 32400 0 AWST}
     {152042400 32400 1 AWDT}
     {162928800 28800 0 AWST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Sydney b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Sydney
index b1c4411799b..fd01af61bbc 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Sydney
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Australia/Sydney
@@ -3,14 +3,14 @@
 set TZData(:Australia/Sydney) {
     {-9223372036854775808 36292 0 LMT}
     {-2364113092 36000 0 AEST}
-    {-1672567140 39600 1 AEDT}
-    {-1665392400 36000 0 AEST}
+    {-1672560000 39600 1 AEDT}
+    {-1665388800 36000 0 AEST}
     {-883641600 39600 1 AEDT}
-    {-876128400 36000 0 AEST}
+    {-876124800 36000 0 AEST}
     {-860400000 39600 1 AEDT}
-    {-844678800 36000 0 AEST}
+    {-844675200 36000 0 AEST}
     {-828345600 39600 1 AEDT}
-    {-813229200 36000 0 AEST}
+    {-813225600 36000 0 AEST}
     {31500000 36000 0 AEST}
     {57686400 39600 1 AEDT}
     {67968000 36000 0 AEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Budapest b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Budapest
index e660ad1de87..4b92c5ff6b4 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Budapest
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Budapest
@@ -2,17 +2,19 @@
 
 set TZData(:Europe/Budapest) {
     {-9223372036854775808 4580 0 LMT}
-    {-2500938980 3600 0 CET}
+    {-2498260580 3600 0 CET}
     {-1693706400 7200 1 CEST}
     {-1680483600 3600 0 CET}
     {-1663455600 7200 1 CEST}
     {-1650150000 3600 0 CET}
     {-1640998800 3600 0 CET}
-    {-1633212000 7200 1 CEST}
+    {-1632006000 7200 1 CEST}
     {-1618700400 3600 0 CET}
-    {-1600466400 7200 1 CEST}
-    {-1581202800 3600 0 CET}
-    {-906771600 3600 0 CET}
+    {-1600470000 7200 1 CEST}
+    {-1587250800 3600 0 CET}
+    {-1569711600 7200 1 CEST}
+    {-1555196400 3600 0 CET}
+    {-906775200 3600 0 CET}
     {-857257200 3600 0 CET}
     {-844556400 7200 1 CEST}
     {-828226800 3600 0 CET}
@@ -20,33 +22,32 @@ set TZData(:Europe/Budapest) {
     {-796777200 3600 0 CET}
     {-788922000 3600 0 CET}
     {-778471200 7200 1 CEST}
-    {-762660000 3600 0 CET}
+    {-762656400 3600 0 CET}
     {-749689200 7200 1 CEST}
-    {-733359600 3600 0 CET}
+    {-733276800 3600 0 CET}
     {-717634800 7200 1 CEST}
     {-701910000 3600 0 CET}
     {-686185200 7200 1 CEST}
     {-670460400 3600 0 CET}
     {-654130800 7200 1 CEST}
     {-639010800 3600 0 CET}
-    {-621990000 7200 1 CEST}
-    {-605660400 3600 0 CET}
     {-492656400 7200 1 CEST}
     {-481168800 3600 0 CET}
-    {-461120400 7200 1 CEST}
-    {-449632800 3600 0 CET}
-    {-428547600 7200 1 CEST}
-    {-418269600 3600 0 CET}
-    {-397094400 7200 1 CEST}
+    {-461199600 7200 1 CEST}
+    {-449708400 3600 0 CET}
+    {-428540400 7200 1 CEST}
+    {-418258800 3600 0 CET}
+    {-397090800 7200 1 CEST}
     {-386809200 3600 0 CET}
-    {323827200 7200 1 CEST}
-    {338950800 3600 0 CET}
-    {354675600 7200 1 CEST}
-    {370400400 3600 0 CET}
-    {386125200 7200 1 CEST}
-    {401850000 3600 0 CET}
-    {417574800 7200 1 CEST}
-    {433299600 3600 0 CET}
+    {323823600 7200 1 CEST}
+    {338943600 3600 0 CET}
+    {354668400 7200 1 CEST}
+    {370393200 3600 0 CET}
+    {386118000 7200 1 CEST}
+    {401842800 3600 0 CET}
+    {417567600 7200 1 CEST}
+    {433292400 3600 0 CET}
+    {441759600 3600 0 CET}
     {449024400 7200 1 CEST}
     {465354000 3600 0 CET}
     {481078800 7200 1 CEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Monaco b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Monaco
index f887b0b6587..7428b2ffee5 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Monaco
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Monaco
@@ -2,8 +2,8 @@
 
 set TZData(:Europe/Monaco) {
     {-9223372036854775808 1772 0 LMT}
-    {-2486680172 561 0 PMT}
-    {-1855958961 0 0 WET}
+    {-2448318572 561 0 PMT}
+    {-1854403761 0 0 WET}
     {-1689814800 3600 1 WEST}
     {-1680397200 0 0 WET}
     {-1665363600 3600 1 WEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Paris b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Paris
index 4b22a090fc2..7208e554c08 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Paris
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Paris
@@ -2,8 +2,8 @@
 
 set TZData(:Europe/Paris) {
     {-9223372036854775808 561 0 LMT}
-    {-2486678901 561 0 PMT}
-    {-1855958901 0 0 WET}
+    {-2486592561 561 0 PMT}
+    {-1855958961 0 0 WET}
     {-1689814800 3600 1 WEST}
     {-1680397200 0 0 WET}
     {-1665363600 3600 1 WEST}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Volgograd b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Volgograd
index 3938683d803..2ce2dfe6c43 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Volgograd
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Europe/Volgograd
@@ -69,4 +69,5 @@ set TZData(:Europe/Volgograd) {
     {1301180400 14400 0 +04}
     {1414274400 10800 0 +03}
     {1540681200 14400 0 +04}
+    {1609020000 10800 0 +03}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Indian/Mahe b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Indian/Mahe
index 3dd5b408c4f..dcafc360f5d 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Indian/Mahe
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Indian/Mahe
@@ -2,5 +2,5 @@
 
 set TZData(:Indian/Mahe) {
     {-9223372036854775808 13308 0 LMT}
-    {-2006653308 14400 0 +04}
+    {-1988163708 14400 0 +04}
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Efate b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Efate
index a026ee1dda7..5a225468d30 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Efate
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Efate
@@ -3,9 +3,11 @@
 set TZData(:Pacific/Efate) {
     {-9223372036854775808 40396 0 LMT}
     {-1829387596 39600 0 +11}
+    {125409600 43200 1 +11}
+    {133876800 39600 0 +11}
     {433256400 43200 1 +11}
     {448977600 39600 0 +11}
-    {467298000 43200 1 +11}
+    {464706000 43200 1 +11}
     {480427200 39600 0 +11}
     {496760400 43200 1 +11}
     {511876800 39600 0 +11}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Fiji b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Fiji
index e316b93f26c..a06291327f6 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Fiji
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/tzdata/Pacific/Fiji
@@ -29,7 +29,7 @@ set TZData(:Pacific/Fiji) {
     {1547301600 43200 0 +12}
     {1573308000 46800 1 +12}
     {1578751200 43200 0 +12}
-    {1604757600 46800 1 +12}
+    {1608386400 46800 1 +12}
     {1610805600 43200 0 +12}
     {1636812000 46800 1 +12}
     {1642255200 43200 0 +12}
diff --git a/Master/tlpkg/tltcl/lib/tcl8.6/word.tcl b/Master/tlpkg/tltcl/lib/tcl8.6/word.tcl
index 3e4bc3ac2a5..828f13ab348 100644
--- a/Master/tlpkg/tltcl/lib/tcl8.6/word.tcl
+++ b/Master/tlpkg/tltcl/lib/tcl8.6/word.tcl
@@ -4,8 +4,8 @@
 # strings. This file is primarily needed so Tk text and entry widgets behave
 # properly for different platforms.
 #
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# Copyright (c) 1998 by Scritpics Corporation.
+# Copyright (c) 1996 Sun Microsystems, Inc.
+# Copyright (c) 1998 Scritpics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -146,7 +146,9 @@ proc tcl_startOfNextWord {str start} {
 proc tcl_startOfPreviousWord {str start} {
     variable ::tcl::WordBreakRE
     set word {-1 -1}
-    regexp -indices -- $WordBreakRE(previous) [string range $str 0 $start-1] \
-	    result word
+    if {$start > 0} {
+	regexp -indices -- $WordBreakRE(previous) [string range $str 0 $start-1] \
+		result word
+    }
     return [lindex $word 0]
 }
diff --git a/Master/tlpkg/tltcl/lib/tcl8/8.4/platform-1.0.14.tm b/Master/tlpkg/tltcl/lib/tcl8/8.4/platform-1.0.15.tm
index 35a22a31536..6c01142ab6a 100644
--- a/Master/tlpkg/tltcl/lib/tcl8/8.4/platform-1.0.14.tm
+++ b/Master/tlpkg/tltcl/lib/tcl8/8.4/platform-1.0.15.tm
@@ -94,9 +94,6 @@ proc ::platform::generic {} {
     }
 
     switch -glob -- $plat {
-	cygwin* {
-	    set plat cygwin
-	}
 	windows {
 	    if {$tcl_platform(platform) == "unix"} {
 		set plat cygwin
@@ -149,6 +146,9 @@ proc ::platform::generic {} {
 	osf1 {
 	    set plat tru64
 	}
+	default {
+	    set plat [lindex [split $plat _-] 0]
+	}
     }
 
     return "${plat}-${cpu}"
@@ -175,11 +175,15 @@ proc ::platform::identify {} {
 	}
 	macosx {
 	    set major [lindex [split $tcl_platform(osVersion) .] 0]
-	    if {$major > 8} {
+	    if {$major > 19} {
+		incr major -20
+		append plat 11.$major
+	    } else {
 		incr major -4
 		append plat 10.$major
 		return "${plat}-${cpu}"
 	    }
+	    return "${plat}-${cpu}"
 	}
 	linux {
 	    # Look for the libc*.so and determine its version
@@ -330,7 +334,7 @@ proc ::platform::patterns {id} {
 	    lappend res macosx-universal macosx-i386-x86_64
 	}
 	macosx*-*    {
-	    # 10.5+
+	    # 10.5+,11.0+
 	    if {[regexp {macosx([^-]*)-(.*)} $id -> v cpu]} {
 
 		switch -exact -- $cpu {
@@ -338,17 +342,39 @@ proc ::platform::patterns {id} {
 			lappend alt i386-x86_64
 			lappend alt universal
 		    }
-		    x86_64  { lappend alt i386-x86_64 }
+		    x86_64  {
+			if {[lindex [split $::tcl_platform(osVersion) .] 0] < 19} {
+			    set alt i386-x86_64
+			} else {
+			    set alt {}
+			}
+		    }
+		    arm  {
+			lappend alt x86_64
+		    }
 		    default { set alt {} }
 		}
 
 		if {$v ne ""} {
 		    foreach {major minor} [split $v .] break
 
-		    # Add 10.5 to 10.minor to patterns.
 		    set res {}
+		    if {$major eq 11} {
+			# Add 11.0 to 11.minor to patterns.
+			for {set j $minor} {$j >= 0} {incr j -1} {
+			    lappend res macosx${major}.${j}-${cpu}
+			    foreach a $alt {
+				lappend res macosx${major}.${j}-$a
+			    }
+			}
+			set major 10
+			set minor 15
+		    }
+		    # Add 10.5 to 10.minor to patterns.
 		    for {set j $minor} {$j >= 5} {incr j -1} {
-			lappend res macosx${major}.${j}-${cpu}
+			if {$cpu ne "arm"} {
+			    lappend res macosx${major}.${j}-${cpu}
+			}
 			foreach a $alt {
 			    lappend res macosx${major}.${j}-$a
 			}
@@ -378,7 +404,7 @@ proc ::platform::patterns {id} {
 # ### ### ### ######### ######### #########
 ## Ready
 
-package provide platform 1.0.14
+package provide platform 1.0.15
 
 # ### ### ### ######### ######### #########
 ## Demo application
diff --git a/Master/tlpkg/tltcl/lib/tcl8/8.5/msgcat-1.6.1.tm b/Master/tlpkg/tltcl/lib/tcl8/8.5/msgcat-1.6.1.tm
index 646bc179e42..fa91a3740ef 100644
--- a/Master/tlpkg/tltcl/lib/tcl8/8.5/msgcat-1.6.1.tm
+++ b/Master/tlpkg/tltcl/lib/tcl8/8.5/msgcat-1.6.1.tm
@@ -4,9 +4,9 @@
 #	message catalog facility for Tcl programs.  It should be
 #	loaded with the command "package require msgcat".
 #
-# Copyright (c) 2010-2015 by Harald Oehlmann.
-# Copyright (c) 1998-2000 by Ajuba Solutions.
-# Copyright (c) 1998 by Mark Harrison.
+# Copyright (c) 2010-2015 Harald Oehlmann.
+# Copyright (c) 1998-2000 Ajuba Solutions.
+# Copyright (c) 1998 Mark Harrison.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/Master/tlpkg/tltcl/lib/tcl8/8.5/tcltest-2.5.1.tm b/Master/tlpkg/tltcl/lib/tcl8/8.5/tcltest-2.5.3.tm
index a7a68c757f9..7dc75d7db4b 100644
--- a/Master/tlpkg/tltcl/lib/tcl8/8.5/tcltest-2.5.1.tm
+++ b/Master/tlpkg/tltcl/lib/tcl8/8.5/tcltest-2.5.3.tm
@@ -11,8 +11,8 @@
 #	Microsystems.
 #
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# Copyright (c) 2000 by Ajuba Solutions
+# Copyright (c) 1998-1999 Scriptics Corporation.
+# Copyright (c) 2000 Ajuba Solutions
 # Contributions from Don Porter, NIST, 2002.  (not subject to US copyright)
 # All rights reserved.
 
@@ -22,7 +22,7 @@ namespace eval tcltest {
     # When the version number changes, be sure to update the pkgIndex.tcl file,
     # and the install directory in the Makefiles.  When the minor version
     # changes (new feature) be sure to update the man page as well.
-    variable Version 2.5.1
+    variable Version 2.5.3
 
     # Compatibility support for dumb variables defined in tcltest 1
     # Do not use these.  Call [package provide Tcl] and [info patchlevel]
@@ -41,7 +41,9 @@ namespace eval tcltest {
 	    outputChannel testConstraint
 
     # Export commands that are duplication (candidates for deprecation)
-    namespace export bytestring		;# dups [encoding convertfrom identity]
+    if {![package vsatisfies [package provide Tcl] 8.7-]} {
+	namespace export bytestring	;# dups [encoding convertfrom identity]
+    }
     namespace export debug		;#	[configure -debug]
     namespace export errorFile		;#	[configure -errfile]
     namespace export limitConstraints	;#	[configure -limitconstraints]
@@ -640,7 +642,7 @@ namespace eval tcltest {
 
     proc IsVerbose {level} {
 	variable Option
-	return [expr {[lsearch -exact $Option(-verbose) $level] != -1}]
+	return [expr {[lsearch -exact $Option(-verbose) $level] >= 0}]
     }
 
     # Default verbosity is to show bodies of failed tests
@@ -811,14 +813,14 @@ namespace eval tcltest {
     trace add variable Option(-errfile) write \
 	    [namespace code {errorChannel $Option(-errfile) ;#}]
 
-    proc loadIntoSlaveInterpreter {slave args} {
+    proc loadIntoChildInterpreter {child args} {
 	variable Version
-	interp eval $slave [package ifneeded tcltest $Version]
-	interp eval $slave "tcltest::configure {*}{$args}"
-	interp alias $slave ::tcltest::ReportToMaster \
-	    {} ::tcltest::ReportedFromSlave
+	interp eval $child [package ifneeded tcltest $Version]
+	interp eval $child "tcltest::configure {*}{$args}"
+	interp alias $child ::tcltest::ReportToParent \
+	    {} ::tcltest::ReportedFromChild
     }
-    proc ReportedFromSlave {total passed skipped failed because newfiles} {
+    proc ReportedFromChild {total passed skipped failed because newfiles} {
 	variable numTests
 	variable skippedBecause
 	variable createdNewFiles
@@ -970,7 +972,7 @@ proc tcltest::testConstraint {constraint {value ""}} {
 	return $testConstraints($constraint)
     }
     # Check for boolean values
-    if {[catch {expr {$value && $value}} msg]} {
+    if {[catch {expr {$value && 1}} msg]} {
 	return -code error $msg
     }
     if {[limitConstraints] && ($constraint ni $Option(-constraints))} {
@@ -1269,7 +1271,7 @@ proc tcltest::DefineConstraintInitializers {} {
 
     ConstraintInitializer nonBlockFiles {
 	    set code [expr {[catch {set f [open defs r]}]
-		    || [catch {chan configure $f -blocking off}]}]
+		    || [catch {fconfigure $f -blocking off}]}]
 	    catch {close $f}
 	    set code
     }
@@ -1982,16 +1984,24 @@ proc tcltest::test {name description args} {
 	}
     }
 
-    # First, run the setup script
+    # First, run the setup script (or a hook if it presents):
+    if {[set cmd [namespace which -command [namespace current]::SetupTest]] ne ""} {
+	set setup [list $cmd $setup]
+    }
+    set processTest 1
     set code [catch {uplevel 1 $setup} setupMsg]
     if {$code == 1} {
 	set errorInfo(setup) $::errorInfo
 	set errorCodeRes(setup) $::errorCode
+	if {$errorCodeRes(setup) eq "BYPASS-SKIPPED-TEST"} {
+	    _noticeSkipped $name $setupMsg
+	    set processTest [set code 0]
+	}
     }
     set setupFailure [expr {$code != 0}]
 
     # Only run the test body if the setup was successful
-    if {!$setupFailure} {
+    if {$processTest && !$setupFailure} {
 
 	# Register startup time
 	if {[IsVerbose msec] || [IsVerbose usec]} {
@@ -2014,16 +2024,20 @@ proc tcltest::test {name description args} {
 	if {$returnCode == 1} {
 	    set errorInfo(body) $::errorInfo
 	    set errorCodeRes(body) $::errorCode
+	    if {$errorCodeRes(body) eq "BYPASS-SKIPPED-TEST"} {
+		_noticeSkipped $name $actualAnswer
+		set processTest [set returnCode 0]
+	    }
 	}
     }
 
     # check if the return code matched the expected return code
     set codeFailure 0
-    if {!$setupFailure && ($returnCode ni $returnCodes)} {
+    if {$processTest && !$setupFailure && ($returnCode ni $returnCodes)} {
 	set codeFailure 1
     }
     set errorCodeFailure 0
-    if {!$setupFailure && !$codeFailure && $returnCode == 1 && \
+    if {$processTest && !$setupFailure && !$codeFailure && $returnCode == 1 && \
                 ![string match $errorCode $errorCodeRes(body)]} {
 	set errorCodeFailure 1
     }
@@ -2032,7 +2046,7 @@ proc tcltest::test {name description args} {
     # them.  If the comparison fails, then so did the test.
     set outputFailure 0
     variable outData
-    if {[info exists output] && !$codeFailure} {
+    if {$processTest && [info exists output] && !$codeFailure} {
 	if {[set outputCompare [catch {
 	    CompareStrings $outData $output $match
 	} outputMatch]] == 0} {
@@ -2044,7 +2058,7 @@ proc tcltest::test {name description args} {
 
     set errorFailure 0
     variable errData
-    if {[info exists errorOutput] && !$codeFailure} {
+    if {$processTest && [info exists errorOutput] && !$codeFailure} {
 	if {[set errorCompare [catch {
 	    CompareStrings $errData $errorOutput $match
 	} errorMatch]] == 0} {
@@ -2056,7 +2070,9 @@ proc tcltest::test {name description args} {
 
     # check if the answer matched the expected answer
     # Only check if we ran the body of the test (no setup failure)
-    if {$setupFailure || $codeFailure} {
+    if {!$processTest} {
+    	set scriptFailure 0
+    } elseif {$setupFailure || $codeFailure} {
 	set scriptFailure 0
     } elseif {[set scriptCompare [catch {
 	CompareStrings $actualAnswer $result $match
@@ -2066,7 +2082,10 @@ proc tcltest::test {name description args} {
 	set scriptFailure 1
     }
 
-    # Always run the cleanup script
+    # Always run the cleanup script (or a hook if it presents):
+    if {[set cmd [namespace which -command [namespace current]::CleanupTest]] ne ""} {
+	set cleanup [list $cmd $cleanup]
+    }
     set code [catch {uplevel 1 $cleanup} cleanupMsg]
     if {$code == 1} {
 	set errorInfo(cleanup) $::errorInfo
@@ -2117,6 +2136,12 @@ proc tcltest::test {name description args} {
 	}
     }
 
+    # if skipped, it is safe to return here
+    if {!$processTest} {
+	incr testLevel -1
+	return
+    }
+
     # if we didn't experience any failures, then we passed
     variable numTests
     if {!($setupFailure || $cleanupFailure || $coreFailure
@@ -2177,7 +2202,7 @@ proc tcltest::test {name description args} {
 	    puts [outputChannel] "---- errorCode(setup): $errorCodeRes(setup)"
 	}
     }
-    if {$scriptFailure} {
+    if {$processTest && $scriptFailure} {
 	if {$scriptCompare} {
 	    puts [outputChannel] "---- Error testing result: $scriptMatch"
 	} else {
@@ -2244,6 +2269,32 @@ proc tcltest::test {name description args} {
     return
 }
 
+# Skip --
+#
+# Skips a running test and add a reason to skipped "constraints". Can be used
+# to conditional intended abort of the test.
+#
+# Side Effects:  Maintains tally of total tests seen and tests skipped.
+#
+proc tcltest::Skip {reason} {
+    return -code error -errorcode BYPASS-SKIPPED-TEST $reason
+}
+
+proc tcltest::_noticeSkipped {name reason} {
+    variable testLevel
+    variable numTests
+
+    if {[IsVerbose skip]} {
+	puts [outputChannel] "++++ $name SKIPPED: $reason"
+    }
+
+    if {$testLevel == 1} {
+	incr numTests(Skipped)
+	AddToSkippedBecause $reason
+    }
+}
+
+
 # Skipped --
 #
 # Given a test name and it constraints, returns a boolean indicating
@@ -2324,14 +2375,7 @@ proc tcltest::Skipped {name constraints} {
 	}
 
 	if {!$doTest} {
-	    if {[IsVerbose skip]} {
-		puts [outputChannel] "++++ $name SKIPPED: $constraints"
-	    }
-
-	    if {$testLevel == 1} {
-		incr numTests(Skipped)
-		AddToSkippedBecause $constraints
-	    }
+	    _noticeSkipped $name $constraints
 	    return 1
 	}
     }
@@ -2354,6 +2398,10 @@ proc tcltest::RunTest {name script} {
 	memory tag $name
     }
 
+    # run the test script (or a hook if it presents):
+    if {[set cmd [namespace which -command [namespace current]::EvalTest]] ne ""} {
+	set script [list $cmd $script]
+    }
     set code [catch {uplevel 1 $script} actualAnswer]
 
     return [list $actualAnswer $code]
@@ -2416,8 +2464,8 @@ proc tcltest::cleanupTests {{calledFromAllFile 0}} {
     set testFileName [file tail [info script]]
 
     # Hook to handle reporting to a parent interpreter
-    if {[llength [info commands [namespace current]::ReportToMaster]]} {
-	ReportToMaster $numTests(Total) $numTests(Passed) $numTests(Skipped) \
+    if {[llength [info commands [namespace current]::ReportToParent]]} {
+	ReportToParent $numTests(Total) $numTests(Passed) $numTests(Skipped) \
 	    $numTests(Failed) [array get skippedBecause] \
 	    [array get createdNewFiles]
 	set testSingleFile false
@@ -2752,7 +2800,6 @@ proc tcltest::runAllTests { {shell ""} } {
     variable numTests
     variable failFiles
     variable DefaultValue
-    set failFilesAccum {}
 
     FillFilesExisted
     if {[llength [info level 0]] == 1} {
@@ -2808,8 +2855,18 @@ proc tcltest::runAllTests { {shell ""} } {
 	flush [outputChannel]
 
 	if {[singleProcess]} {
-	    incr numTestFiles
-	    uplevel 1 [list ::source $file]
+	    if {[catch {
+		incr numTestFiles
+		uplevel 1 [list ::source $file]
+	    } msg]} {
+		puts [outputChannel] "Test file error: $msg"
+		# append the name of the test to a list to be reported
+		# later
+		lappend testFileFailures $file
+	    }
+	    if {$numTests(Failed) > 0} {
+		set failFilesSet 1
+	    }
 	} else {
 	    # Pass along our configuration to the child processes.
 	    # EXCEPT for the -outfile, because the parent process
@@ -2842,7 +2899,7 @@ proc tcltest::runAllTests { {shell ""} } {
 			}
 			if {$Failed > 0} {
 			    lappend failFiles $testFile
-			    lappend failFilesAccum $testFile
+			    set failFilesSet 1
 			}
 		    } elseif {[regexp [join {
 			    {^Number of tests skipped }
@@ -2889,7 +2946,7 @@ proc tcltest::runAllTests { {shell ""} } {
 	puts [outputChannel] ""
 	puts [outputChannel] [string repeat ~ 44]
     }
-    return [expr {[info exists testFileFailures] || [llength $failFilesAccum]}]
+    return [expr {[info exists testFileFailures] || [info exists failFilesSet]}]
 }
 
 #####################################################################
@@ -3024,7 +3081,10 @@ proc tcltest::makeFile {contents name {directory ""}} {
 	     putting ``$contents'' into $fullName"
 
     set fd [open $fullName w]
-    chan configure $fd -translation lf
+    fconfigure $fd -translation lf
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	fconfigure $fd -encoding utf-8
+    }
     if {[string index $contents end] eq "\n"} {
 	puts -nonewline $fd $contents
     } else {
@@ -3061,11 +3121,12 @@ proc tcltest::removeFile {name {directory ""}} {
     set fullName [file join $directory $name]
     DebugPuts 3 "[lindex [info level 0] 0]: removing $fullName"
     set idx [lsearch -exact $filesMade $fullName]
-    set filesMade [lreplace $filesMade $idx $idx]
-    if {$idx == -1} {
+    if {$idx < 0} {
 	DebugDo 1 {
 	    Warn "removeFile removing \"$fullName\":\n  not created by makeFile"
 	}
+    } else {
+	set filesMade [lreplace $filesMade $idx $idx]
     }
     if {![file isfile $fullName]} {
 	DebugDo 1 {
@@ -3137,7 +3198,7 @@ proc tcltest::removeDirectory {name {directory ""}} {
     DebugPuts 3 "[lindex [info level 0] 0]: deleting $fullName"
     set idx [lsearch -exact $filesMade $fullName]
     set filesMade [lreplace $filesMade $idx $idx]
-    if {$idx == -1} {
+    if {$idx < 0} {
 	DebugDo 1 {
 	    Warn "removeDirectory removing \"$fullName\":\n  not created\
 		    by makeDirectory"
@@ -3172,6 +3233,9 @@ proc tcltest::viewFile {name {directory ""}} {
     }
     set fullName [file join $directory $name]
     set f [open $fullName]
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	fconfigure $f -encoding utf-8
+    }
     set data [read -nonewline $f]
     close $f
     return $data
@@ -3186,13 +3250,16 @@ proc tcltest::viewFile {name {directory ""}} {
 #    procedures that are supposed to accept strings with embedded NULL
 #    bytes.
 # 2. Confirm that a string result has a certain pattern of bytes, for
-#    instance to confirm that "\xe0\0" in a Tcl script is stored
-#    internally in UTF-8 as the sequence of bytes "\xc3\xa0\xc0\x80".
+#    instance to confirm that "\xE0\0" in a Tcl script is stored
+#    internally in UTF-8 as the sequence of bytes "\xC3\xA0\xC0\x80".
 #
 # Generally, it's a bad idea to examine the bytes in a Tcl string or to
 # construct improperly formed strings in this manner, because it involves
 # exposing that Tcl uses UTF-8 internally.
 #
+# This function doesn't work any more in Tcl 8.7, since the 'identity'
+# is gone (TIP #345)
+#
 # Arguments:
 #	string being converted
 #
@@ -3202,8 +3269,10 @@ proc tcltest::viewFile {name {directory ""}} {
 # Side effects:
 #	None
 
-proc tcltest::bytestring {string} {
-    return [encoding convertfrom identity $string]
+if {![package vsatisfies [package provide Tcl] 8.7-]} {
+    proc tcltest::bytestring {string} {
+	return [encoding convertfrom identity $string]
+    }
 }
 
 # tcltest::OpenFiles --
diff --git a/Master/tlpkg/tltcl/lib/tcl8/8.6/http-2.9.1.tm b/Master/tlpkg/tltcl/lib/tcl8/8.6/http-2.9.5.tm
index 0aa283f00dd..b0f87de4ef6 100644
--- a/Master/tlpkg/tltcl/lib/tcl8/8.6/http-2.9.1.tm
+++ b/Master/tlpkg/tltcl/lib/tcl8/8.6/http-2.9.5.tm
@@ -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.9.1
+package provide http 2.9.5
 
 namespace eval http {
     # Allow resourcing to not clobber existing data
@@ -531,7 +531,7 @@ proc http::CloseSocket {s {token {}}} {
     } else {
 	set map [array get socketMapping]
 	set ndx [lsearch -exact $map $s]
-	if {$ndx != -1} {
+	if {$ndx >= 0} {
 	    incr ndx -1
 	    set connId [lindex $map $ndx]
 	}
@@ -721,7 +721,7 @@ proc http::geturl {url args} {
 	body		{}
 	status		""
 	http		""
-	connection	close
+	connection	keep-alive
     }
     set state(-keepalive) $defaultKeepalive
     set state(-strict) $strict
@@ -733,6 +733,7 @@ proc http::geturl {url args} {
 	-strict		boolean
 	-timeout	integer
 	-validate	boolean
+	-headers	dict
     }
     set state(charset)	$defaultCharset
     set options {
@@ -746,9 +747,8 @@ proc http::geturl {url args} {
     foreach {flag value} $args {
 	if {[regexp -- $pat $flag]} {
 	    # Validate numbers
-	    if {
-		[info exists type($flag)] &&
-		![string is $type($flag) -strict $value]
+	    if {($flag eq "-headers") ? [catch {dict size $value}] :
+		([info exists type($flag)] && ![string is $type($flag) -strict $value])
 	    } {
 		unset $token
 		return -code error \
@@ -966,6 +966,18 @@ proc http::geturl {url args} {
 	set state(-pipeline) $http(-pipeline)
     }
 
+    # We cannot handle chunked encodings with -handler, so force HTTP/1.0
+    # until we can manage this.
+    if {[info exists state(-handler)]} {
+	set state(-protocol) 1.0
+    }
+
+    # RFC 7320 A.1 - HTTP/1.0 Keep-Alive is problematic. We do not support it.
+    if {$state(-protocol) eq "1.0"} {
+	set state(connection) close
+	set state(-keepalive) 0
+    }
+
     # See if we are supposed to use a previously opened channel.
     # - In principle, ANY call to http::geturl could use a previously opened
     #   channel if it is available - the "Connection: keep-alive" header is a
@@ -1037,7 +1049,7 @@ proc http::geturl {url args} {
 
 	    }
 	    # Do not automatically close the connection socket.
-	    set state(connection) {}
+	    set state(connection) keep-alive
 	}
     }
 
@@ -1332,19 +1344,12 @@ proc http::Connected {token proto phost srvurl} {
 	set how POST
 	# The query channel must be blocking for the async Write to
 	# work properly.
-	lassign [fconfigure $sock -translation] trRead trWrite
-	fconfigure $state(-querychannel) -blocking 1 \
-					 -translation [list $trRead binary]
+	fconfigure $state(-querychannel) -blocking 1 -translation binary
 	set contDone 0
     }
     if {[info exists state(-method)] && ($state(-method) ne "")} {
 	set how $state(-method)
     }
-    # We cannot handle chunked encodings with -handler, so force HTTP/1.0
-    # until we can manage this.
-    if {[info exists state(-handler)]} {
-	set state(-protocol) 1.0
-    }
     set accept_types_seen 0
 
     Log ^B$tk begin sending request - token $token
@@ -1363,7 +1368,7 @@ proc http::Connected {token proto phost srvurl} {
 	    puts $sock "Host: $host:$port"
 	}
 	puts $sock "User-Agent: $http(-useragent)"
-	if {($state(-protocol) >= 1.0) && $state(-keepalive)} {
+	if {($state(-protocol) > 1.0) && $state(-keepalive)} {
 	    # Send this header, because a 1.1 server is not compelled to treat
 	    # this as the default.
 	    puts $sock "Connection: keep-alive"
@@ -1371,9 +1376,17 @@ proc http::Connected {token proto phost srvurl} {
 	if {($state(-protocol) > 1.0) && !$state(-keepalive)} {
 	    puts $sock "Connection: close" ;# RFC2616 sec 8.1.2.1
 	}
-	if {[info exists phost] && ($phost ne "") && $state(-keepalive)} {
-	    puts $sock "Proxy-Connection: Keep-Alive"
-	}
+	if {($state(-protocol) < 1.1)} {
+	    # RFC7230 A.1
+	    # Some server implementations of HTTP/1.0 have a faulty
+	    # implementation of RFC 2068 Keep-Alive.
+	    # Don't leave this to chance.
+	    # For HTTP/1.0 we have already "set state(connection) close"
+	    # and "state(-keepalive) 0".
+	    puts $sock "Connection: close"
+	}
+	# RFC7230 A.1 - "clients are encouraged not to send the
+	# Proxy-Connection header field in any requests"
 	set accept_encoding_seen 0
 	set content_type_seen 0
 	dict for {key value} $state(-headers) {
@@ -1633,9 +1646,51 @@ proc http::ReceiveResponse {token} {
     Log ^D$tk begin receiving response - token $token
 
     coroutine ${token}EventCoroutine http::Event $sock $token
-    fileevent $sock readable ${token}EventCoroutine
+    if {[info exists state(-handler)] || [info exists state(-progress)]} {
+        fileevent $sock readable [list http::EventGateway $sock $token]
+    } else {
+        fileevent $sock readable ${token}EventCoroutine
+    }
+    return
+}
+
+
+# http::EventGateway
+#
+#	Bug [c2dc1da315].
+#	- Recursive launch of the coroutine can occur if a -handler or -progress
+#	  callback is used, and the callback command enters the event loop.
+#	- To prevent this, the fileevent "binding" is disabled while the
+#	  coroutine is in flight.
+#	- If a recursive call occurs despite these precautions, it is not
+#	  trapped and discarded here, because it is better to report it as a
+#	  bug.
+#	- Although this solution is believed to be sufficiently general, it is
+#	  used only if -handler or -progress is specified.  In other cases,
+#	  the coroutine is called directly.
+
+proc http::EventGateway {sock token} {
+    variable $token
+    upvar 0 $token state
+    fileevent $sock readable {}
+    catch {${token}EventCoroutine} res opts
+    if {[info commands ${token}EventCoroutine] ne {}} {
+        # The coroutine can be deleted by completion (a non-yield return), by
+        # http::Finish (when there is a premature end to the transaction), by
+        # http::reset or http::cleanup, or if the caller set option -channel
+        # but not option -handler: in the last case reading from the socket is
+        # now managed by commands ::http::Copy*, http::ReceiveChunked, and
+        # http::make-transformation-chunked.
+        #
+        # Catch in case the coroutine has closed the socket.
+        catch {fileevent $sock readable [list http::EventGateway $sock $token]}
+    }
+
+    # If there was an error, re-throw it.
+    return -options $opts $res
 }
 
+
 # http::NextPipelinedWrite
 #
 # - Connecting a socket to a token for writing is done by this command and by
@@ -2690,8 +2745,32 @@ proc http::Event {sock token} {
 			}
 			proxy-connection -
 			connection {
-			    set state(connection) \
-				    [string trim [string tolower $value]]
+			    set tmpHeader [string trim [string tolower $value]]
+			    # RFC 7230 Section 6.1 states that a comma-separated
+			    # list is an acceptable value.  According to
+			    # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Connection
+			    # any comma-separated list implies keep-alive, but I
+			    # don't see this in the RFC so we'll play safe and
+			    # scan any list for "close".
+			    if {$tmpHeader in {close keep-alive}} {
+				# The common cases, continue.
+			    } elseif {[string first , $tmpHeader] < 0} {
+				# Not a comma-separated list, not "close",
+				# therefore "keep-alive".
+				set tmpHeader keep-alive
+			    } else {
+				set tmpResult keep-alive
+				set tmpCsl [split $tmpHeader ,]
+				# Optional whitespace either side of separator.
+				foreach el $tmpCsl {
+				    if {[string trim $el] eq {close}} {
+					set tmpResult close
+					break
+				    }
+			        }
+				set tmpHeader $tmpResult
+			    }
+			    set state(connection) $tmpHeader
 			}
 		    }
 		    lappend state(meta) $key [string trim $value]
diff --git a/Master/tlpkg/tltcl/lib/tcl8/8.6/tdbc/sqlite3-1.1.1.tm b/Master/tlpkg/tltcl/lib/tcl8/8.6/tdbc/sqlite3-1.1.2.tm
index f046f0610f6..1535906c996 100644
--- a/Master/tlpkg/tltcl/lib/tcl8/8.6/tdbc/sqlite3-1.1.1.tm
+++ b/Master/tlpkg/tltcl/lib/tcl8/8.6/tdbc/sqlite3-1.1.2.tm
@@ -13,7 +13,7 @@
 package require tdbc
 package require sqlite3
 
-package provide tdbc::sqlite3 1.1.1
+package provide tdbc::sqlite3 1.1.2
 
 namespace eval tdbc::sqlite3 {
     namespace export connection
diff --git a/Master/tlpkg/tltcl/lib/tclConfig.sh b/Master/tlpkg/tltcl/lib/tclConfig.sh
index 646a7433916..d0a0983df47 100644
--- a/Master/tlpkg/tltcl/lib/tclConfig.sh
+++ b/Master/tlpkg/tltcl/lib/tclConfig.sh
@@ -15,13 +15,13 @@ TCL_DLL_FILE="tcl86.dll"
 TCL_VERSION='8.6'
 TCL_MAJOR_VERSION='8'
 TCL_MINOR_VERSION='6'
-TCL_PATCH_LEVEL='.10'
+TCL_PATCH_LEVEL='.11'
 
 # C compiler to use for compilation.
 TCL_CC='i686-w64-mingw32-gcc'
 
 # -D flags for use with the C compiler.
-TCL_DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DTCL_CFGVAL_ENCODING=\"cp1252\" -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DMODULE_SCOPE=extern -DHAVE_NO_SEH=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_ZLIB=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_INTRIN_H=1 -DHAVE_WSPIAPI_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1 '
+TCL_DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DTCL_CFGVAL_ENCODING=\"cp1252\" -DMODULE_SCOPE=extern -DHAVE_NO_SEH=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_ZLIB=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_INTRIN_H=1 -DHAVE_WSPIAPI_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1 '
 
 # If TCL was built with debugging symbols, generated libraries contain
 # this string at the end of the library name (before the extension).
@@ -39,7 +39,7 @@ TCL_LDFLAGS_OPTIMIZE=''
 TCL_SHARED_BUILD=1
 
 # The name of the Tcl library (may be either a .a file or a shared library):
-TCL_LIB_FILE='libtcl86.a'
+TCL_LIB_FILE='libtcl86.dll.a'
 
 # Flag to indicate whether shared libraries need export files.
 TCL_NEEDS_EXP_FILE=
@@ -48,24 +48,24 @@ TCL_NEEDS_EXP_FILE=
 # name that comes after the "libxxx" (includes version number, if any,
 # extension, and anything else needed).  May depend on the variables
 # VERSION.  On most UNIX systems this is ${VERSION}.exp.
-TCL_EXPORT_FILE_SUFFIX='${NODOT_VERSION}${DBGX}.a'
+TCL_EXPORT_FILE_SUFFIX='${NODOT_VERSION}.a'
 
 # Additional libraries to use when linking Tcl.
 TCL_LIBS='-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -lws2_32'
 
 # Top-level directory in which Tcl's platform-independent files are
 # installed.
-TCL_PREFIX='/tmp/siepo/tcltk'
+TCL_PREFIX='/home/siepo/tltcl'
 
 # Top-level directory in which Tcl's platform-specific files (e.g.
 # executables) are installed.
-TCL_EXEC_PREFIX='/tmp/siepo/tcltk'
+TCL_EXEC_PREFIX='/home/siepo/tltcl'
 
 # Flags to pass to cc when compiling the components of a shared library:
 TCL_SHLIB_CFLAGS=''
 
 # Flags to pass to cc to get warning messages
-TCL_CFLAGS_WARNING='-Wall -Wdeclaration-after-statement'
+TCL_CFLAGS_WARNING='-Wall -Wpointer-arith -Wdeclaration-after-statement'
 
 # Extra flags to pass to cc:
 TCL_EXTRA_CFLAGS='-pipe'
@@ -111,15 +111,15 @@ TCL_LIB_FLAG=''
 
 # String to pass to linker to pick up the Tcl library from its
 # build directory.
-TCL_BUILD_LIB_SPEC='-L/tmp/siepo/tcl8.6.10/win -ltcl86'
+TCL_BUILD_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tcl8.6.11/win -ltcl86'
 
 # String to pass to linker to pick up the Tcl library from its
 # installed directory.
-TCL_LIB_SPEC='-L/tmp/siepo/tcltk/lib -ltcl86'
+TCL_LIB_SPEC='-L/home/siepo/tltcl/lib -ltcl86'
 
 # String to pass to the compiler so that an extension can
 # find installed Tcl headers.
-TCL_INCLUDE_SPEC='-I/tmp/siepo/tcltk/include'
+TCL_INCLUDE_SPEC='-I/home/siepo/tltcl/include'
 
 # Indicates whether a version numbers should be used in -l switches
 # ("ok" means it's safe to use switches like -ltcl7.5;  "nodots" means
@@ -132,13 +132,13 @@ TCL_LIB_VERSIONS_OK=''
 # extension, and anything else needed).  May depend on the variables
 # VERSION and SHLIB_SUFFIX.  On most UNIX systems this is
 # ${VERSION}${SHLIB_SUFFIX}.
-TCL_SHARED_LIB_SUFFIX='${NODOT_VERSION}${DBGX}.dll'
+TCL_SHARED_LIB_SUFFIX='${NODOT_VERSION}.dll'
 
 # String that can be evaluated to generate the part of an unshared library
 # name that comes after the "libxxx" (includes version number, if any,
 # extension, and anything else needed).  May depend on the variable
 # VERSION.  On most UNIX systems this is ${VERSION}.a.
-TCL_UNSHARED_LIB_SUFFIX='${NODOT_VERSION}${DBGX}.a'
+TCL_UNSHARED_LIB_SUFFIX='${NODOT_VERSION}.a'
 
 # Location of the top-level source directory from which Tcl was built.
 # This is the directory that contains a README file as well as
@@ -146,12 +146,12 @@ TCL_UNSHARED_LIB_SUFFIX='${NODOT_VERSION}${DBGX}.a'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tcl was
 # compiled.
-TCL_SRC_DIR='/tmp/siepo/tcl8.6.10'
+TCL_SRC_DIR='/home/siepo/xdrive/tltcl/tcl8.6.11'
 
 # List of standard directories in which to look for packages during
 # "package require" commands.  Contains the "prefix" directory plus also
 # the "exec_prefix" directory, if it is different.
-TCL_PACKAGE_PATH='/tmp/siepo/tcltk/lib'
+TCL_PACKAGE_PATH='{/home/siepo/tltcl/lib}'
 
 # Tcl supports stub.
 TCL_SUPPORTS_STUBS=1
@@ -164,17 +164,17 @@ TCL_STUB_LIB_FLAG='-ltclstub86'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # build directory.
-TCL_BUILD_STUB_LIB_SPEC='-L/tmp/siepo/tcl8.6.10/win -ltclstub86'
+TCL_BUILD_STUB_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tcl8.6.11/win -ltclstub86'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # installed directory.
-TCL_STUB_LIB_SPEC='-L/tmp/siepo/tcltk/lib -ltclstub86'
+TCL_STUB_LIB_SPEC='-L/home/siepo/tltcl/lib -ltclstub86'
 
 # Path to the Tcl stub library in the build directory.
-TCL_BUILD_STUB_LIB_PATH='/tmp/siepo/tcl8.6.10/win/libtclstub86.a'
+TCL_BUILD_STUB_LIB_PATH='/home/siepo/xdrive/tltcl/tcl8.6.11/win/libtclstub86.a'
 
 # Path to the Tcl stub library in the install directory.
-TCL_STUB_LIB_PATH='/tmp/siepo/tcltk/lib/libtclstub86.a'
+TCL_STUB_LIB_PATH='/home/siepo/tltcl/lib/libtclstub86.a'
 
 # Flag, 1: we built Tcl with threads enabled, 0 we didn't
 TCL_THREADS=1
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.1/libtdbcstub111.a b/Master/tlpkg/tltcl/lib/tdbc1.1.1/libtdbcstub111.a
deleted file mode 100644
index 95b91c4feac..00000000000
--- a/Master/tlpkg/tltcl/lib/tdbc1.1.1/libtdbcstub111.a
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbc111.dll b/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbc111.dll
deleted file mode 100755
index b46a539996e..00000000000
--- a/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbc111.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbcConfig.sh b/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbcConfig.sh
deleted file mode 100644
index fb79bb63e46..00000000000
--- a/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbcConfig.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-# tdbcConfig.sh --
-#
-# This shell script (for sh) is generated automatically by TDBC's configure
-# script. It will create shell variables for most of the configuration options
-# discovered by the configure script. This script is intended to be included
-# by the configure scripts for TDBC extensions so that they don't have to
-# figure this all out for themselves.
-#
-# The information in this file is specific to a single platform.
-#
-# RCS: @(#) $Id$
-
-# TDBC's version number
-tdbc_VERSION=1.1.1
-TDBC_VERSION=1.1.1
-
-# Name of the TDBC library - may be either a static or shared library
-tdbc_LIB_FILE=tdbc111.dll
-TDBC_LIB_FILE=tdbc111.dll
-
-# String to pass to the linker to pick up the TDBC library from its build dir
-tdbc_BUILD_LIB_SPEC="-L/tmp/siepo/tcl8.6.10/win/pkgs/tdbc1.1.1 -ltdbc111"
-TDBC_BUILD_LIB_SPEC="-L/tmp/siepo/tcl8.6.10/win/pkgs/tdbc1.1.1 -ltdbc111"
-
-# String to pass to the linker to pick up the TDBC library from its installed
-# dir.
-tdbc_LIB_SPEC="-L/tmp/siepo/tcltk/lib/tdbc1.1.1 -ltdbc111"
-TDBC_LIB_SPEC="-L/tmp/siepo/tcltk/lib/tdbc1.1.1 -ltdbc111"
-
-# Name of the TBDC stub library
-tdbc_STUB_LIB_FILE="libtdbcstub111.a"
-TDBC_STUB_LIB_FILE="libtdbcstub111.a"
-
-# String to pass to the linker to pick up the TDBC stub library from its
-# build directory
-tdbc_BUILD_STUB_LIB_SPEC="-L/tmp/siepo/tcl8.6.10/win/pkgs/tdbc1.1.1 -ltdbcstub111"
-TDBC_BUILD_STUB_LIB_SPEC="-L/tmp/siepo/tcl8.6.10/win/pkgs/tdbc1.1.1 -ltdbcstub111"
-
-# String to pass to the linker to pick up the TDBC stub library from its
-# installed directory
-tdbc_STUB_LIB_SPEC="-L/tmp/siepo/tcltk/lib/tdbc1.1.1 -ltdbcstub111"
-TDBC_STUB_LIB_SPEC="-L/tmp/siepo/tcltk/lib/tdbc1.1.1 -ltdbcstub111"
-
-# Path name of the TDBC stub library in its build directory
-tdbc_BUILD_STUB_LIB_PATH="/tmp/siepo/tcl8.6.10/win/pkgs/tdbc1.1.1/libtdbcstub111.a"
-TDBC_BUILD_STUB_LIB_PATH="/tmp/siepo/tcl8.6.10/win/pkgs/tdbc1.1.1/libtdbcstub111.a"
-
-# Path name of the TDBC stub library in its installed directory
-tdbc_STUB_LIB_PATH="/tmp/siepo/tcltk/lib/tdbc1.1.1/libtdbcstub111.a"
-TDBC_STUB_LIB_PATH="/tmp/siepo/tcltk/lib/tdbc1.1.1/libtdbcstub111.a"
-
-# Location of the top-level source directories from which TDBC was built.
-# This is the directory that contains doc/, generic/ and so on.  If TDBC
-# was compiled in a directory other than the source directory, this still
-# points to the location of the sources, not the location where TDBC was
-# compiled.
-tdbc_SRC_DIR="/tmp/siepo/tcl8.6.10/pkgs/tdbc1.1.1"
-TDBC_SRC_DIR="/tmp/siepo/tcl8.6.10/pkgs/tdbc1.1.1"
-
-# String to pass to the compiler so that an extension can find installed TDBC
-# headers
-tdbc_INCLUDE_SPEC="-I/tmp/siepo/tcltk/include"
-TDBC_INCLUDE_SPEC="-I/tmp/siepo/tcltk/include"
-
-# String to pass to the compiler so that an extension can find TDBC headers
-# in the source directory
-tdbc_BUILD_INCLUDE_SPEC="-I/tmp/siepo/tcl8.6.10/pkgs/tdbc1.1.1/generic"
-TDBC_BUILD_INCLUDE_SPEC="-I/tmp/siepo/tcl8.6.10/pkgs/tdbc1.1.1/generic"
-
-# Path name where .tcl files in the tdbc package appear at run time.
-tdbc_LIBRARY_PATH="/tmp/siepo/tcltk/lib/tdbc1.1.1"
-TDBC_LIBRARY_PATH="/tmp/siepo/tcltk/lib/tdbc1.1.1"
-
-# Path name where .tcl files in the tdbc package appear at build time.
-tdbc_BUILD_LIBRARY_PATH="/tmp/siepo/tcl8.6.10/pkgs/tdbc1.1.1/library"
-TDBC_BUILD_LIBRARY_PATH="/tmp/siepo/tcl8.6.10/pkgs/tdbc1.1.1/library"
-
-# Additional flags that must be passed to the C compiler to use tdbc
-tdbc_CFLAGS=
-TDBC_CFLAGS=
-
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.2/libtdbcstub112.a b/Master/tlpkg/tltcl/lib/tdbc1.1.2/libtdbcstub112.a
new file mode 100644
index 00000000000..33182696816
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tdbc1.1.2/libtdbcstub112.a
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.1/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/tdbc1.1.2/pkgIndex.tcl
index ab541acb771..6b0204ae868 100644
--- a/Master/tlpkg/tltcl/lib/tdbc1.1.1/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbc1.1.2/pkgIndex.tcl
@@ -11,8 +11,8 @@ apply {{dir} {
     if {![file exists $libraryfile] && [info exists ::env(TDBC_LIBRARY)]} {
 	set libraryfile [file join $::env(TDBC_LIBRARY) tdbc.tcl]
     }
-    package ifneeded tdbc 1.1.1 \
+    package ifneeded tdbc 1.1.2 \
 	"package require TclOO 1.0-;\
-	[list load [file join $dir tdbc111.dll] tdbc]\;\
+	[list load [file join $dir tdbc112.dll] tdbc]\;\
 	[list source $libraryfile]"
 }} $dir
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbc.tcl b/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbc.tcl
index 2a167cbefe4..2a167cbefe4 100644
--- a/Master/tlpkg/tltcl/lib/tdbc1.1.1/tdbc.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbc.tcl
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbc112.dll b/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbc112.dll
new file mode 100644
index 00000000000..c2ec9eacf21
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbc112.dll
diff --git a/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbcConfig.sh b/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbcConfig.sh
new file mode 100644
index 00000000000..86e50015c54
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tdbc1.1.2/tdbcConfig.sh
@@ -0,0 +1,81 @@
+# tdbcConfig.sh --
+#
+# This shell script (for sh) is generated automatically by TDBC's configure
+# script. It will create shell variables for most of the configuration options
+# discovered by the configure script. This script is intended to be included
+# by the configure scripts for TDBC extensions so that they don't have to
+# figure this all out for themselves.
+#
+# The information in this file is specific to a single platform.
+#
+# RCS: @(#) $Id$
+
+# TDBC's version number
+tdbc_VERSION=1.1.2
+TDBC_VERSION=1.1.2
+
+# Name of the TDBC library - may be either a static or shared library
+tdbc_LIB_FILE=tdbc112.dll
+TDBC_LIB_FILE=tdbc112.dll
+
+# String to pass to the linker to pick up the TDBC library from its build dir
+tdbc_BUILD_LIB_SPEC="-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/tdbc1.1.2 -ltdbc112"
+TDBC_BUILD_LIB_SPEC="-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/tdbc1.1.2 -ltdbc112"
+
+# String to pass to the linker to pick up the TDBC library from its installed
+# dir.
+tdbc_LIB_SPEC="-L/home/siepo/tltcl/lib/tdbc1.1.2 -ltdbc112"
+TDBC_LIB_SPEC="-L/home/siepo/tltcl/lib/tdbc1.1.2 -ltdbc112"
+
+# Name of the TBDC stub library
+tdbc_STUB_LIB_FILE="libtdbcstub112.a"
+TDBC_STUB_LIB_FILE="libtdbcstub112.a"
+
+# String to pass to the linker to pick up the TDBC stub library from its
+# build directory
+tdbc_BUILD_STUB_LIB_SPEC="-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/tdbc1.1.2 -ltdbcstub112"
+TDBC_BUILD_STUB_LIB_SPEC="-L/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/tdbc1.1.2 -ltdbcstub112"
+
+# String to pass to the linker to pick up the TDBC stub library from its
+# installed directory
+tdbc_STUB_LIB_SPEC="-L/home/siepo/tltcl/lib/tdbc1.1.2 -ltdbcstub112"
+TDBC_STUB_LIB_SPEC="-L/home/siepo/tltcl/lib/tdbc1.1.2 -ltdbcstub112"
+
+# Path name of the TDBC stub library in its build directory
+tdbc_BUILD_STUB_LIB_PATH="/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/tdbc1.1.2/libtdbcstub112.a"
+TDBC_BUILD_STUB_LIB_PATH="/home/siepo/xdrive/tltcl/tcl8.6.11/win/pkgs/tdbc1.1.2/libtdbcstub112.a"
+
+# Path name of the TDBC stub library in its installed directory
+tdbc_STUB_LIB_PATH="/home/siepo/tltcl/lib/tdbc1.1.2/libtdbcstub112.a"
+TDBC_STUB_LIB_PATH="/home/siepo/tltcl/lib/tdbc1.1.2/libtdbcstub112.a"
+
+# Location of the top-level source directories from which TDBC was built.
+# This is the directory that contains doc/, generic/ and so on.  If TDBC
+# was compiled in a directory other than the source directory, this still
+# points to the location of the sources, not the location where TDBC was
+# compiled.
+tdbc_SRC_DIR="/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/tdbc1.1.2"
+TDBC_SRC_DIR="/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/tdbc1.1.2"
+
+# String to pass to the compiler so that an extension can find installed TDBC
+# headers
+tdbc_INCLUDE_SPEC="-I/home/siepo/tltcl/include"
+TDBC_INCLUDE_SPEC="-I/home/siepo/tltcl/include"
+
+# String to pass to the compiler so that an extension can find TDBC headers
+# in the source directory
+tdbc_BUILD_INCLUDE_SPEC="-I/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/tdbc1.1.2/generic"
+TDBC_BUILD_INCLUDE_SPEC="-I/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/tdbc1.1.2/generic"
+
+# Path name where .tcl files in the tdbc package appear at run time.
+tdbc_LIBRARY_PATH="/home/siepo/tltcl/lib/tdbc1.1.2"
+TDBC_LIBRARY_PATH="/home/siepo/tltcl/lib/tdbc1.1.2"
+
+# Path name where .tcl files in the tdbc package appear at build time.
+tdbc_BUILD_LIBRARY_PATH="/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/tdbc1.1.2/library"
+TDBC_BUILD_LIBRARY_PATH="/home/siepo/xdrive/tltcl/tcl8.6.11/pkgs/tdbc1.1.2/library"
+
+# Additional flags that must be passed to the C compiler to use tdbc
+tdbc_CFLAGS=
+TDBC_CFLAGS=
+
diff --git a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/tdbcmysql111.dll b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/tdbcmysql111.dll
deleted file mode 100755
index 657bae0ddd2..00000000000
--- a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/tdbcmysql111.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/pkgIndex.tcl
index c1d901303d9..8f16661350d 100644
--- a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/pkgIndex.tcl
@@ -3,6 +3,6 @@
 if {[catch {package require Tcl 8.6}]} {
     return
 }
-package ifneeded tdbc::mysql 1.1.1 \
+package ifneeded tdbc::mysql 1.1.2 \
     "[list source [file join $dir tdbcmysql.tcl]]\;\
-    [list load [file join $dir tdbcmysql111.dll] tdbcmysql]"
+    [list load [file join $dir tdbcmysql112.dll] tdbcmysql]"
diff --git a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/tdbcmysql.tcl b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/tdbcmysql.tcl
index caa334c470d..caa334c470d 100644
--- a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.1/tdbcmysql.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/tdbcmysql.tcl
diff --git a/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/tdbcmysql112.dll b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/tdbcmysql112.dll
new file mode 100644
index 00000000000..a5f32f66f90
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tdbcmysql1.1.2/tdbcmysql112.dll
diff --git a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/tdbcodbc111.dll b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/tdbcodbc111.dll
deleted file mode 100755
index 587f8a0f62f..00000000000
--- a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/tdbcodbc111.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/pkgIndex.tcl
index e8c976b439d..4d87954b3a2 100644
--- a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/pkgIndex.tcl
@@ -3,6 +3,6 @@
 if {[catch {package require Tcl 8.6}]} {
     return
 }
-package ifneeded tdbc::odbc 1.1.1 \
+package ifneeded tdbc::odbc 1.1.2 \
     "[list source [file join $dir tdbcodbc.tcl]]\;\
-    [list load [file join $dir tdbcodbc111.dll] tdbcodbc]"
+    [list load [file join $dir tdbcodbc112.dll] tdbcodbc]"
diff --git a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/tdbcodbc.tcl b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/tdbcodbc.tcl
index 0b19a4b8912..0b19a4b8912 100644
--- a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.1/tdbcodbc.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/tdbcodbc.tcl
diff --git a/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/tdbcodbc112.dll b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/tdbcodbc112.dll
new file mode 100644
index 00000000000..23eb29e0aa5
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tdbcodbc1.1.2/tdbcodbc112.dll
diff --git a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/tdbcpostgres111.dll b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/tdbcpostgres111.dll
deleted file mode 100755
index 5f3bc807675..00000000000
--- a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/tdbcpostgres111.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/pkgIndex.tcl
index a7fd6ffa15b..424836ce700 100644
--- a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/pkgIndex.tcl
@@ -3,6 +3,6 @@
 if {[catch {package require Tcl 8.6}]} {
     return
 }
-package ifneeded tdbc::postgres 1.1.1 \
+package ifneeded tdbc::postgres 1.1.2 \
     "[list source [file join $dir tdbcpostgres.tcl]]\;\
-    [list load [file join $dir tdbcpostgres111.dll] tdbcpostgres]"
+    [list load [file join $dir tdbcpostgres112.dll] tdbcpostgres]"
diff --git a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/tdbcpostgres.tcl b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/tdbcpostgres.tcl
index c5c4ef0f85a..c5c4ef0f85a 100644
--- a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.1/tdbcpostgres.tcl
+++ b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/tdbcpostgres.tcl
diff --git a/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/tdbcpostgres112.dll b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/tdbcpostgres112.dll
new file mode 100644
index 00000000000..51b6c65ab4b
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/tdbcpostgres1.1.2/tdbcpostgres112.dll
diff --git a/Master/tlpkg/tltcl/lib/thread2.8.5/thread285.dll b/Master/tlpkg/tltcl/lib/thread2.8.5/thread285.dll
deleted file mode 100755
index 4cf4684638e..00000000000
--- a/Master/tlpkg/tltcl/lib/thread2.8.5/thread285.dll
+++ /dev/null
diff --git a/Master/tlpkg/tltcl/lib/thread2.8.5/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/thread2.8.6/pkgIndex.tcl
index 9c67f9795cd..e8923611342 100644
--- a/Master/tlpkg/tltcl/lib/thread2.8.5/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/thread2.8.6/pkgIndex.tcl
@@ -11,7 +11,7 @@ if {![package vsatisfies [package provide Tcl] 8.4]} {
     }
 }
 
-# All Tcl 8.4+ interps can [load] Thread 2.8.5
+# All Tcl 8.4+ interps can [load] Thread 2.8.6
 #
 # For interps that are not thread-enabled, we still call [package ifneeded].
 # This is contrary to the usual convention, but is a good idea because we
@@ -23,13 +23,13 @@ if {![package vsatisfies [package provide Tcl] 8.4]} {
 # about a thread-disabled interp, instead of the message
 # "can't find package Thread".
 
-package ifneeded Thread 2.8.5 [list load [file join $dir thread285.dll]]
+package ifneeded Thread 2.8.6 [list load [file join $dir thread286.dll] [string totitle thread]]
 
 # package Ttrace uses some support machinery.
 
 # In Tcl 8.4 interps we use some older interfaces
 if {![package vsatisfies [package provide Tcl] 8.5]} {
-    package ifneeded Ttrace 2.8.5 "
+    package ifneeded Ttrace 2.8.6 "
     [list proc thread_source {dir} {
 	if {[info exists ::env(TCL_THREAD_LIBRARY)] &&
 		[file readable $::env(TCL_THREAD_LIBRARY)/ttrace.tcl]} {
@@ -50,7 +50,7 @@ if {![package vsatisfies [package provide Tcl] 8.5]} {
 
 # In Tcl 8.5+ interps; use [::apply]
 
-package ifneeded Ttrace 2.8.5 [list ::apply {{dir} {
+package ifneeded Ttrace 2.8.6 [list ::apply {{dir} {
     if {[info exists ::env(TCL_THREAD_LIBRARY)] &&
 	[file readable $::env(TCL_THREAD_LIBRARY)/ttrace.tcl]} {
 	source $::env(TCL_THREAD_LIBRARY)/ttrace.tcl
diff --git a/Master/tlpkg/tltcl/lib/thread2.8.6/thread286.dll b/Master/tlpkg/tltcl/lib/thread2.8.6/thread286.dll
new file mode 100644
index 00000000000..eae33d82126
--- /dev/null
+++ b/Master/tlpkg/tltcl/lib/thread2.8.6/thread286.dll
diff --git a/Master/tlpkg/tltcl/lib/thread2.8.5/ttrace.tcl b/Master/tlpkg/tltcl/lib/thread2.8.6/ttrace.tcl
index 679d4eedc23..0834596a566 100644
--- a/Master/tlpkg/tltcl/lib/thread2.8.5/ttrace.tcl
+++ b/Master/tlpkg/tltcl/lib/thread2.8.6/ttrace.tcl
@@ -73,7 +73,7 @@ namespace eval ttrace {
     }
 
     # Keep in sync with the Thread package
-    package provide Ttrace 2.8.5
+    package provide Ttrace 2.8.6
 
     # Package variables
     variable resolvers ""     ; # List of registered resolvers
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/bgerror.tcl b/Master/tlpkg/tltcl/lib/tk8.6/bgerror.tcl
index 84219247605..fe8dfe0410e 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/bgerror.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/bgerror.tcl
@@ -41,7 +41,7 @@ proc ::tk::dialog::error::Details {} {
     set w .bgerrorDialog
     set caption [option get $w.function text {}]
     set command [option get $w.function command {}]
-    if { ($caption eq "") || ($command eq "") } {
+    if {($caption eq "") || ($command eq "")} {
 	grid forget $w.function
     }
     lappend command [$w.top.info.text get 1.0 end-1c]
@@ -50,7 +50,7 @@ proc ::tk::dialog::error::Details {} {
 }
 
 proc ::tk::dialog::error::SaveToLog {text} {
-    if { $::tcl_platform(platform) eq "windows" } {
+    if {$::tcl_platform(platform) eq "windows"} {
 	set allFiles *.*
     } else {
 	set allFiles *
@@ -129,11 +129,11 @@ proc ::tk::dialog::error::bgerror {err {flag 1}} {
     set lines 0
     set maxLine 45
     foreach line [split $err \n] {
-	if { [string length $line] > $maxLine } {
-	    append displayedErr "[string range $line 0 [expr {$maxLine-3}]]..."
+	if {[string length $line] > $maxLine} {
+	    append displayedErr "[string range $line 0 $maxLine-3]..."
 	    break
 	}
-	if { $lines > 4 } {
+	if {$lines > 4} {
 	    append displayedErr "..."
 	    break
 	} else {
@@ -182,7 +182,7 @@ proc ::tk::dialog::error::bgerror {err {flag 1}} {
     pack $W.text -side left -expand yes -fill both
     $W.text insert 0.0 "$err\n$info"
     $W.text mark set insert 0.0
-    bind $W.text <ButtonPress-1> { focus %W }
+    bind $W.text <Button-1> {focus %W}
     $W.text configure -state disabled
 
     # 2. Fill the top part with bitmap and message
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/clrpick.tcl b/Master/tlpkg/tltcl/lib/tk8.6/clrpick.tcl
index 600be162efe..e408d037edd 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/clrpick.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/clrpick.tcl
@@ -396,7 +396,7 @@ proc ::tk::dialog::color::DrawColorScale {w c {create 0}} {
 
 	# Draw the selection polygons
 	CreateSelector $w $sel $c
-	$sel bind $data($c,index) <ButtonPress-1> \
+	$sel bind $data($c,index) <Button-1> \
 		[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad) 1]
 	$sel bind $data($c,index) <B1-Motion> \
 		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]
@@ -409,14 +409,14 @@ proc ::tk::dialog::color::DrawColorScale {w c {create 0}} {
 	set data($c,clickRegion) [$sel create rectangle 0 0 \
 		$data(canvasWidth) $height -fill {} -outline {}]
 
-	bind $col <ButtonPress-1> \
+	bind $col <Button-1> \
 		[list tk::dialog::color::StartMove $w $sel $c %x $data(colorPad)]
 	bind $col <B1-Motion> \
 		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(colorPad)]
 	bind $col <ButtonRelease-1> \
 		[list tk::dialog::color::ReleaseMouse $w $sel $c %x $data(colorPad)]
 
-	$sel bind $data($c,clickRegion) <ButtonPress-1> \
+	$sel bind $data($c,clickRegion) <Button-1> \
 		[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad)]
 	$sel bind $data($c,clickRegion) <B1-Motion> \
 		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/comdlg.tcl b/Master/tlpkg/tltcl/lib/tk8.6/comdlg.tcl
index 18df8a64352..b4d89785423 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/comdlg.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/comdlg.tcl
@@ -29,7 +29,8 @@
 #    {....}
 # }
 #
-# flags = currently unused.
+# flags = a list of flags. Currently supported flags are:
+#     DONTSETDEFAULTS = skip default values setting
 #
 # argList = The list of  "-option value" pairs.
 #
@@ -63,8 +64,10 @@ proc tclParseConfigSpec {w specs flags argList} {
 
     # 2: set the default values
     #
-    foreach cmdsw [array names cmd] {
-	set data($cmdsw) $def($cmdsw)
+    if {"DONTSETDEFAULTS" ni $flags} {
+        foreach cmdsw [array names cmd] {
+	    set data($cmdsw) $def($cmdsw)
+        }
     }
 
     # 3: parse the argument list
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/console.tcl b/Master/tlpkg/tltcl/lib/tk8.6/console.tcl
index 355a43b003b..30c4d88305c 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/console.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/console.tcl
@@ -131,7 +131,7 @@ proc ::tk::ConsoleInit {} {
         default { set preferred {} }
     }
     foreach {family size} $preferred {
-        if {[lsearch -exact $families $family] != -1} {
+        if {$family in $families} {
             font configure TkConsoleFont -family $family -size $size
             break
         }
@@ -592,7 +592,7 @@ proc ::tk::ConsoleBind {w} {
     }
     bind Console <F9> {
 	eval destroy [winfo child .]
-	source [file join $tk_library console.tcl]
+	source -encoding utf-8 [file join $tk_library console.tcl]
     }
     if {[tk windowingsystem] eq "aqua"} {
 	bind Console <Command-q> {
@@ -740,9 +740,9 @@ proc ::tk::console::FontchooserToggle {} {
 }
 proc ::tk::console::FontchooserVisibility {index} {
     if {[tk fontchooser configure -visible]} {
-	.menubar.edit entryconfigure $index -label [msgcat::mc "Hide Fonts"]
+	.menubar.edit entryconfigure $index -label [::tk::msgcat::mc "Hide Fonts"]
     } else {
-	.menubar.edit entryconfigure $index -label [msgcat::mc "Show Fonts"]
+	.menubar.edit entryconfigure $index -label [::tk::msgcat::mc "Show Fonts"]
     }
 }
 proc ::tk::console::FontchooserFocus {w isFocusIn} {
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/arrow.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/arrow.tcl
index 12249c0b258..3d0b40672b4 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/arrow.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/arrow.tcl
@@ -154,11 +154,11 @@ $c bind box <Enter> "$c itemconfigure current $demo_arrowInfo(activeStyle)"
 $c bind box <Leave> "$c itemconfigure current $demo_arrowInfo(boxStyle)"
 $c bind box <B1-Enter> " "
 $c bind box <B1-Leave> " "
-$c bind box1 <1> {set demo_arrowInfo(motionProc) arrowMove1}
-$c bind box2 <1> {set demo_arrowInfo(motionProc) arrowMove2}
-$c bind box3 <1> {set demo_arrowInfo(motionProc) arrowMove3}
+$c bind box1 <Button-1> {set demo_arrowInfo(motionProc) arrowMove1}
+$c bind box2 <Button-1> {set demo_arrowInfo(motionProc) arrowMove2}
+$c bind box3 <Button-1> {set demo_arrowInfo(motionProc) arrowMove3}
 $c bind box <B1-Motion> "\$demo_arrowInfo(motionProc) $c %x %y"
-bind $c <Any-ButtonRelease-1> "arrowSetup $c"
+bind $c <ButtonRelease-1> "arrowSetup $c"
 
 # arrowMove1 --
 # This procedure is called for each mouse motion event on box1 (the
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/bind.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/bind.tcl
index 03f6d3b68e4..8b56639f80f 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/bind.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/bind.tcl
@@ -63,16 +63,16 @@ $w.text insert end \
 # Create bindings for tags.
 
 foreach tag {d1 d2 d3 d4 d5 d6} {
-    $w.text tag bind $tag <Any-Enter> "$w.text tag configure $tag $bold"
-    $w.text tag bind $tag <Any-Leave> "$w.text tag configure $tag $normal"
+    $w.text tag bind $tag <Enter> "$w.text tag configure $tag $bold"
+    $w.text tag bind $tag <Leave> "$w.text tag configure $tag $normal"
 }
 # Main widget program sets variable tk_demoDirectory
-$w.text tag bind d1 <1> {source [file join $tk_demoDirectory items.tcl]}
-$w.text tag bind d2 <1> {source [file join $tk_demoDirectory plot.tcl]}
-$w.text tag bind d3 <1> {source [file join $tk_demoDirectory ctext.tcl]}
-$w.text tag bind d4 <1> {source [file join $tk_demoDirectory arrow.tcl]}
-$w.text tag bind d5 <1> {source [file join $tk_demoDirectory ruler.tcl]}
-$w.text tag bind d6 <1> {source [file join $tk_demoDirectory cscroll.tcl]}
+$w.text tag bind d1 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory items.tcl]}
+$w.text tag bind d2 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory plot.tcl]}
+$w.text tag bind d3 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ctext.tcl]}
+$w.text tag bind d4 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory arrow.tcl]}
+$w.text tag bind d5 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ruler.tcl]}
+$w.text tag bind d6 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory cscroll.tcl]}
 
 $w.text mark set insert 0.0
 $w.text configure -state disabled
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/colors.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/colors.tcl
index 99dec923fdf..fdfdc5b13f4 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/colors.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/colors.tcl
@@ -32,7 +32,7 @@ listbox $w.frame.list -yscroll "$w.frame.scroll set" \
 	-width 20 -height 16 -setgrid 1
 pack $w.frame.list $w.frame.scroll -side left -fill y -expand 1
 
-bind $w.frame.list <Double-1> {
+bind $w.frame.list <Double-Button-1> {
     tk_setPalette [selection get]
 }
 $w.frame.list insert 0 gray60 gray70 gray80 gray85 gray90 gray95 \
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/cscroll.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/cscroll.tcl
index 443b102bef0..d210c7df720 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/cscroll.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/cscroll.tcl
@@ -53,54 +53,84 @@ for {set i 0} {$i < 20} {incr i} {
     }
 }
 
-$c bind all <Any-Enter> "scrollEnter $c"
-$c bind all <Any-Leave> "scrollLeave $c"
-$c bind all <1> "scrollButton $c"
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-if {[tk windowingsystem] eq "aqua"} {
+$c bind all <Enter> "scrollEnter $c"
+$c bind all <Leave> "scrollLeave $c"
+$c bind all <Button-1> "scrollButton $c"
+if {([tk windowingsystem] eq "aqua") && ![package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
     bind $c <MouseWheel> {
-	%W yview scroll [expr {-(%D)}] units
+	%W yview scroll [expr {-%D}] units
     }
     bind $c <Option-MouseWheel> {
-	%W yview scroll [expr {-10 * (%D)}] units
+	%W yview scroll [expr {-10*%D}] units
     }
     bind $c <Shift-MouseWheel> {
-	%W xview scroll [expr {-(%D)}] units
+	%W xview scroll [expr {-%D}] units
     }
     bind $c <Shift-Option-MouseWheel> {
-	%W xview scroll [expr {-10 * (%D)}] units
+	%W xview scroll [expr {-10*%D}] units
     }
 } else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+    # We must make sure that positive and negative movements are rounded
+    # equally to integers, avoiding the problem that
+    #     (int)1/-30 = -1,
+    # but
+    #     (int)-1/-30 = 0
+    # The following code ensure equal +/- behaviour.
     bind $c <MouseWheel> {
-	%W yview scroll [expr {-(%D / 30)}] units
+	if {%D >= 0} {
+	    %W yview scroll [expr {%D/-30}] units
+	} else {
+	    %W yview scroll [expr {(%D-29)/-30}] units
+	}
+    }
+    bind $c <Option-MouseWheel> {
+	if {%D >= 0} {
+	    %W yview scroll [expr {%D/-3}] units
+	} else {
+	    %W yview scroll [expr {(%D-2)/-3}] units
+	}
     }
     bind $c <Shift-MouseWheel> {
-	%W xview scroll [expr {-(%D / 30)}] units
+	if {%D >= 0} {
+	    %W xview scroll [expr {%D/-30}] units
+	} else {
+	    %W xview scroll [expr {(%D-29)/-30}] units
+	}
+    }
+    bind $c <Shift-Option-MouseWheel> {
+	if {%D >= 0} {
+	    %W xview scroll [expr {%D/-3}] units
+	} else {
+	    %W xview scroll [expr {(%D-2)/-3}] units
+	}
     }
 }
 
-if {[tk windowingsystem] eq "x11"} {
+if {[tk windowingsystem] eq "x11" && ![package vsatisfies [package provide Tk] 8.7-]} {
     # Support for mousewheels on Linux/Unix commonly comes through mapping
     # the wheel to the extended buttons.  If you have a mousewheel, find
     # Linux configuration info at:
     #	http://linuxreviews.org/howtos/xfree/mouse/
-    bind $c <4> {
+    bind $c <Button-4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -5 units
 	}
     }
-    bind $c <Shift-4> {
+    bind $c <Shift-Button-4> {
 	if {!$tk_strictMotif} {
 	    %W xview scroll -5 units
 	}
     }
-    bind $c <5> {
+    bind $c <Button-5> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll 5 units
 	}
     }
-    bind $c <Shift-5> {
+    bind $c <Shift-Button-5> {
 	if {!$tk_strictMotif} {
 	    %W xview scroll 5 units
 	}
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/ctext.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/ctext.tcl
index a3b4e8a86e4..d3fec33108e 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/ctext.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/ctext.tcl
@@ -41,16 +41,20 @@ $c create rectangle 245 195 255 205 -outline black -fill red
 # First, create the text item and give it bindings so it can be edited.
 
 $c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left]
-$c bind text <1> "textB1Press $c %x %y"
+$c bind text <Button-1> "textB1Press $c %x %y"
 $c bind text <B1-Motion> "textB1Move $c %x %y"
-$c bind text <Shift-1> "$c select adjust current @%x,%y"
+$c bind text <Shift-Button-1> "$c select adjust current @%x,%y"
 $c bind text <Shift-B1-Motion> "textB1Move $c %x %y"
-$c bind text <KeyPress> "textInsert $c %A"
+$c bind text <Key> "textInsert $c %A"
 $c bind text <Return> "textInsert $c \\n"
 $c bind text <Control-h> "textBs $c"
 $c bind text <BackSpace> "textBs $c"
 $c bind text <Delete> "textDel $c"
-$c bind text <2> "textPaste $c @%x,%y"
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+    $c bind text <Button-3> "textPaste $c @%x,%y"
+} else {
+    $c bind text <Button-2> "textPaste $c @%x,%y"
+}
 
 # Next, create some items that allow the text's anchor position
 # to be edited.
@@ -58,14 +62,14 @@ $c bind text <2> "textPaste $c @%x,%y"
 proc mkTextConfigBox {w x y option value color} {
     set item [$w create rect $x $y [expr {$x+30}] [expr {$y+30}] \
 	    -outline black -fill $color -width 1]
-    $w bind $item <1> "$w itemconf text $option $value"
+    $w bind $item <Button-1> "$w itemconf text $option $value"
     $w addtag config withtag $item
 }
 proc mkTextConfigPie {w x y a option value color} {
     set item [$w create arc $x $y [expr {$x+90}] [expr {$y+90}] \
 	    -start [expr {$a-15}] -extent 30 -outline black -fill $color \
 	    -width 1]
-    $w bind $item <1> "$w itemconf text $option $value"
+    $w bind $item <Button-1> "$w itemconf text $option $value"
     $w addtag config withtag $item
 }
 
@@ -84,7 +88,7 @@ mkTextConfigBox $c [expr {$x+60}] [expr {$y+60}] -anchor nw     $color
 set item [$c create rect \
 	[expr {$x+40}] [expr {$y+40}] [expr {$x+50}] [expr {$y+50}] \
 	-outline black -fill red]
-$c bind $item <1> "$c itemconf text -anchor center"
+$c bind $item <Button-1> "$c itemconf text -anchor center"
 $c create text [expr {$x+45}] [expr {$y-5}] \
 	-text {Text Position}  -anchor s  -font {Times 20}  -fill brown
 
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/dialog1.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/dialog1.tcl
index 976e9550af6..66d8c9afcaf 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/dialog1.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/dialog1.tcl
@@ -2,16 +2,16 @@
 #
 # This demonstration script creates a dialog box with a local grab.
 
-interp create slave
-load {} Tk slave
-slave eval {
-    wm title . slave
+interp create child
+load {} Tk child
+child eval {
+    wm title . child
     wm geometry . +700+30
     pack [text .t -width 30 -height 10]
 }
 
 after idle {.dialog1.msg configure -wraplength 4i}
-set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box.  It uses Tk's "grab" command to create a "local grab" on the dialog box.  The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.  For example, you should be able to edit text in the window named "slave" which was created by a slave interpreter.} \
+set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box.  It uses Tk's "grab" command to create a "local grab" on the dialog box.  The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.  For example, you should be able to edit text in the window named "child" which was created by a child interpreter.} \
 info 0 OK Cancel {Show Code}]
 
 switch $i {
@@ -20,6 +20,6 @@ switch $i {
     2 {showCode .dialog1}
 }
 
-if {[interp exists slave]} {
-    interp delete slave
+if {[interp exists child]} {
+    interp delete child
 }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/entry1.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/entry1.tcl
index eef89644100..7365fc7279a 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/entry1.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/entry1.tcl
@@ -16,7 +16,7 @@ wm title $w "Entry Demonstration (no scrollbars)"
 wm iconname $w "entry1"
 positionWindow $w
 
-label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse button2 pressed."
+label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries by dragging with mouse the middle mouse button pressed."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/entry2.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/entry2.tcl
index 9e3f4ef16c1..6405d8518d2 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/entry2.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/entry2.tcl
@@ -16,7 +16,7 @@ wm title $w "Entry Demonstration (with scrollbars)"
 wm iconname $w "entry2"
 positionWindow $w
 
-label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with mouse button2 pressed."
+label $w.msg -font $font -wraplength 5i -justify left -text "Three different entries are displayed below, with a scrollbar for each entry.  You can add characters by pointing, clicking and typing.  The normal Motif editing characters are supported, along with many Emacs bindings.  For example, Backspace and Control-h delete the character to the left of the insertion cursor and Delete and Control-d delete the chararacter to the right of the insertion cursor.  For entries that are too large to fit in the window all at once, you can scan through the entries with the scrollbars, or by dragging with the middle mouse button pressed."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/entry3.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/entry3.tcl
index d4435c6125d..acde1b3644f 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/entry3.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/entry3.tcl
@@ -102,7 +102,7 @@ foreach {chars digit} {abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9} {
 
 proc validatePhoneChange {W vmode idx char} {
     global phoneNumberMap entry3content
-    if {$idx == -1} {return 1}
+    if {$idx < 0} {return 1}
     after idle [list $W configure -validate $vmode -invcmd bell]
     if {
 	!($idx<3 || $idx==6 || $idx==7 || $idx==11 || $idx>15) &&
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/floor.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/floor.tcl
index d5ef3a0750f..eb2ea7f2893 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/floor.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/floor.tcl
@@ -1354,13 +1354,18 @@ floorDisplay $c 3
 
 # Set up event bindings for canvas:
 
-$c bind floor1 <1> "floorDisplay $c 1"
-$c bind floor2 <1> "floorDisplay $c 2"
-$c bind floor3 <1> "floorDisplay $c 3"
+$c bind floor1 <Button-1> "floorDisplay $c 1"
+$c bind floor2 <Button-1> "floorDisplay $c 2"
+$c bind floor3 <Button-1> "floorDisplay $c 3"
 $c bind room <Enter> "newRoom $c"
 $c bind room <Leave> {set currentRoom ""}
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
+} else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+}
 bind $c <Destroy> "unset currentRoom"
 set currentRoom ""
 trace variable currentRoom w "roomChanged $c"
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/fontchoose.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/fontchoose.tcl
index 8b34377e894..446ed34ec40 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/fontchoose.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/fontchoose.tcl
@@ -55,10 +55,6 @@ grid $f.msg $f.vs -sticky news
 grid $f.font -    -sticky e
 grid columnconfigure $f 0 -weight 1
 grid rowconfigure $f 0 -weight 1
-bind $w <Visibility> {
-    bind %W <Visibility> {}
-    grid propagate %W.f 0
-}
 
 ## See Code / Dismiss buttons
 set btns [addSeeDismiss $w.buttons $w]
@@ -67,3 +63,5 @@ grid $f -sticky news
 grid $btns -sticky ew
 grid columnconfigure $w 0 -weight 1
 grid rowconfigure $w 0 -weight 1
+update idletasks
+grid propagate $f 0
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/goldberg.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/goldberg.tcl
index 284b5c2e521..1cc52c62a89 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/goldberg.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/goldberg.tcl
@@ -105,7 +105,7 @@ proc DoDisplay {w} {
     $w.c yview moveto .05
     pack $w.c -in $w.screen -side top -fill both -expand 1
 
-    bind $w.c <3> [list $w.pause invoke]
+    bind $w.c <Button-3> [list $w.pause invoke]
     bind $w.c <Destroy> {
 	after cancel $animationCallbacks(goldberg)
 	unset animationCallbacks(goldberg)
@@ -162,7 +162,7 @@ proc DoCtrlFrame {w} {
     grid $w.speed -in $w.ctrl -row 99 -sticky ew -pady {0 5}
     pack $w.speed.scale -fill both -expand 1
     grid $w.about -in $w.ctrl -row 100 -sticky ew
-    bind $w.reset <3> {set S(mode) -1}		;# Debugging
+    bind $w.reset <Button-3> {set S(mode) -1}		;# Debugging
 
     ## See Code / Dismiss buttons hack!
     set btns [addSeeDismiss $w.ctrl.buttons $w]
@@ -342,7 +342,7 @@ proc Draw0 {w} {
     set xy {719 119 763 119}
     $w.c create line $xy -tag I0 -fill $color -width 5 -arrow last \
 	    -arrowshape {18 18 5}
-    $w.c bind I0 <1> Start
+    $w.c bind I0 <Button-1> Start
 }
 proc Move0 {w {step {}}} {
     set step [GetStep 0 $step]
@@ -372,7 +372,7 @@ proc Draw1 {w} {
 
     set xy [box 812 122 9]
     $w.c create oval $xy -tag I1 -fill $color2 -outline {}
-    $w.c bind I1 <1> Start
+    $w.c bind I1 <Button-1> Start
 }
 proc Move1 {w {step {}}} {
     set step [GetStep 1 $step]
@@ -1620,7 +1620,7 @@ proc Move26 {w {step {}}} {
 	$w.c delete I24 I26
 	$w.c create text 430 755 -anchor s -tag I26 \
 		-text "click to continue" -font {{Times Roman} 24 bold}
-	bind $w.c <1> [list Reset $w]
+	bind $w.c <Button-1> [list Reset $w]
 	return 4
     }
 
@@ -1675,7 +1675,7 @@ proc RotateC {x y Ox Oy beta} {
 proc Reset {w} {
     global S
     DrawAll $w
-    bind $w.c <1> {}
+    bind $w.c <Button-1> {}
     set S(mode) $::MSTART
     set S(active) 0
 }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/image2.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/image2.tcl
index 2d7ba035cfc..7af52be2459 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/image2.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/image2.tcl
@@ -95,7 +95,7 @@ listbox $w.f.list -width 20 -height 10 -yscrollcommand "$w.f.scroll set"
 ttk::scrollbar $w.f.scroll -command "$w.f.list yview"
 pack $w.f.list $w.f.scroll -side left -fill y -expand 1
 $w.f.list insert 0 earth.gif earthris.gif teapot.ppm
-bind $w.f.list <Double-1> "loadImage $w %x %y"
+bind $w.f.list <Double-Button-1> "loadImage $w %x %y"
 
 catch {image delete image2a}
 image create photo image2a
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/items.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/items.tcl
index be9214a8e4c..1297046113f 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/items.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/items.tcl
@@ -17,7 +17,7 @@ wm iconname $w "Items"
 positionWindow $w
 set c $w.frame.c
 
-label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
+label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Left-Button drag:\tmoves item under pointer.\n  Middle-Button drag:\trepositions view.\n  Right-Button drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
@@ -171,14 +171,21 @@ $c create text 28.5c 17.4c -text Scale: -anchor s
 
 # Set up event bindings for canvas:
 
-$c bind item <Any-Enter> "itemEnter $c"
-$c bind item <Any-Leave> "itemLeave $c"
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-bind $c <3> "itemMark $c %x %y"
-bind $c <B3-Motion> "itemStroke $c %x %y"
+$c bind item <Enter> "itemEnter $c"
+$c bind item <Leave> "itemLeave $c"
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <Button-2> "itemMark $c %x %y"
+    bind $c <B2-Motion> "itemStroke $c %x %y"
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
+} else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+    bind $c <Button-3> "itemMark $c %x %y"
+    bind $c <B3-Motion> "itemStroke $c %x %y"
+}
 bind $c <<NextChar>> "itemsUnderArea $c"
-bind $c <1> "itemStartDrag $c %x %y"
+bind $c <Button-1> "itemStartDrag $c %x %y"
 bind $c <B1-Motion> "itemDrag $c %x %y"
 
 # Utility procedures for highlighting the item under the pointer:
@@ -250,14 +257,14 @@ proc itemsUnderArea {c} {
     set area [$c find withtag area]
     set items ""
     foreach i [$c find enclosed $areaX1 $areaY1 $areaX2 $areaY2] {
-	if {[lsearch [$c gettags $i] item] != -1} {
+	if {[lsearch [$c gettags $i] item] >= 0} {
 	    lappend items $i
 	}
     }
     puts stdout "Items enclosed by area: $items"
     set items ""
     foreach i [$c find overlapping $areaX1 $areaY1 $areaX2 $areaY2] {
-	if {[lsearch [$c gettags $i] item] != -1} {
+	if {[lsearch [$c gettags $i] item] >= 0} {
 	    lappend items $i
 	}
     }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/ixset b/Master/tlpkg/tltcl/lib/tk8.6/demos/ixset
index a857fe06c47..7e8cbe57d6b 100755
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/ixset
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/ixset
@@ -54,7 +54,7 @@ proc readsettings {} {
     global screencyc ;	set screencyc	600
 
     set xfd [open "|xset q" r]
-    while {[gets $xfd line] > -1} {
+    while {[gets $xfd line] >= 0} {
 	switch -- [lindex $line 0] {
 	    auto {
 		set rpt [lindex $line 1]
@@ -197,7 +197,7 @@ proc createwindows {} {
 
     bind . <Return> {.buttons.ok   flash; .buttons.ok   invoke}
     bind . <Escape> {.buttons.quit flash; .buttons.quit invoke}
-    bind . <1> {
+    bind . <Button-1> {
 	if {![string match .buttons* %W]} {
 	    .buttons.apply  configure -state normal
 	    .buttons.cancel configure -state normal
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/knightstour.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/knightstour.tcl
index 3c297206756..11b3b5cffd2 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/knightstour.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/knightstour.tcl
@@ -21,7 +21,7 @@
 #	If you let it repeat then it will choose random start positions
 #	for each new tour.
 
-package require Tk 8.5
+package require Tk
 
 # Return a list of accessible squares from a given square
 proc ValidMoves {square} {
@@ -29,7 +29,7 @@ proc ValidMoves {square} {
     foreach pair {{-1 -2} {-2 -1} {-2 1} {-1 2} {1 2} {2 1} {2 -1} {1 -2}} {
         set col [expr {($square % 8) + [lindex $pair 0]}]
         set row [expr {($square / 8) + [lindex $pair 1]}]
-        if {$row > -1 && $row < 8 && $col > -1 && $col < 8} {
+        if {$row >= 0 && $row < 8 && $col >= 0 && $col < 8} {
             lappend moves [expr {$row * 8 + $col}]
         }
     }
@@ -41,7 +41,7 @@ proc CheckSquare {square} {
     variable visited
     set moves 0
     foreach test [ValidMoves $square] {
-        if {[lsearch -exact -integer $visited $test] == -1} {
+        if {[lsearch -exact -integer $visited $test] < 0} {
             incr moves
         }
     }
@@ -55,7 +55,7 @@ proc Next {square} {
     set minimum 9
     set nextSquare -1
     foreach testSquare [ValidMoves $square] {
-        if {[lsearch -exact -integer $visited $testSquare] == -1} {
+        if {[lsearch -exact -integer $visited $testSquare] < 0} {
             set count [CheckSquare $testSquare]
             if {$count < $minimum} {
                 set minimum $count
@@ -190,7 +190,7 @@ proc CreateGUI {} {
     ttk::button $dlg.tf.b1 -text Start -command [list Tour $dlg]
     ttk::button $dlg.tf.b2 -text Exit -command [list Exit $dlg]
     set square 0
-    for {set row 7} {$row != -1} {incr row -1} {
+    for {set row 7} {$row >= 0} {incr row -1} {
         for {set col 0} {$col < 8} {incr col} {
             if {(($col & 1) ^ ($row & 1))} {
                 set fill tan3 ; set dfill tan4
@@ -218,7 +218,7 @@ proc CreateGUI {} {
             -fill black -activefill "#600000"
     }
     $c moveto knight {*}[lrange [$c coords [expr {1 + int(rand() * 64)}]] 0 1]
-    $c bind knight <ButtonPress-1> [namespace code [list DragStart %W %x %y]]
+    $c bind knight <Button-1> [namespace code [list DragStart %W %x %y]]
     $c bind knight <Motion> [namespace code [list DragMotion %W %x %y]]
     $c bind knight <ButtonRelease-1> [namespace code [list DragEnd %W %x %y]]
 
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/menu.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/menu.tcl
index a788a654061..62991f3e71c 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/menu.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/menu.tcl
@@ -63,7 +63,7 @@ if {[tk windowingsystem] eq "aqua"} {
 }
 foreach i {A B C D E F} {
     $m add command -label "Print letter \"$i\"" -underline 14 \
-	    -accelerator Meta+$i -command "puts $i" -accelerator $modifier+$i
+	    -accelerator $modifier+$i -command "puts $i"
     bind $w <$modifier-[string tolower $i]> "puts $i"
 }
 
@@ -144,9 +144,24 @@ $m entryconfigure "Does almost nothing" -bitmap questhead -compound left \
 set m $w.menu.colors
 $w.menu add cascade -label "Colors" -menu $m -underline 1
 menu $m -tearoff 1
-foreach i {red orange yellow green blue} {
-    $m add command -label $i -background $i -command [list \
-	    puts "You invoked \"$i\"" ]
+if {[tk windowingsystem] eq "aqua"} {
+    # Aqua ignores the -background and -foreground options, but a compound
+    # button can be used for selecting colors.
+    foreach i {red orange yellow green blue} {
+	image create photo image_$i -height 16 -width 16
+	image_$i put black -to 0 0 16 1
+	image_$i put black -to 0 1 1 16
+	image_$i put black -to 0 15 16 16
+	image_$i put black -to 15 1 16 16
+	image_$i put $i -to 1 1 15 15
+	$m add command -label $i -image image_$i -compound left -command [list \
+	puts "You invoked \"$i\"" ]
+    }
+} else {
+    foreach i {red orange yellow green blue} {
+	$m add command -label $i -background $i -command [list \
+	puts "You invoked \"$i\"" ]
+    }
 }
 
 $w configure -menu $w.menu
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/pendulum.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/pendulum.tcl
index 6422c67f0ba..9833e8f89c7 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/pendulum.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/pendulum.tcl
@@ -113,7 +113,7 @@ bind $w.c <Destroy> {
     after cancel $animationCallbacks(pendulum)
     unset animationCallbacks(pendulum)
 }
-bind $w.c <1> {
+bind $w.c <Button-1> {
     after cancel $animationCallbacks(pendulum)
     showPendulum %W at %x %y
 }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/plot.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/plot.tcl
index e7f0361b343..453b7a6653f 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/plot.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/plot.tcl
@@ -55,9 +55,9 @@ foreach point {
     $c addtag point withtag $item
 }
 
-$c bind point <Any-Enter> "$c itemconfig current -fill red"
-$c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
-$c bind point <1> "plotDown $c %x %y"
+$c bind point <Enter> "$c itemconfig current -fill red"
+$c bind point <Leave> "$c itemconfig current -fill SkyBlue2"
+$c bind point <Button-1> "plotDown $c %x %y"
 $c bind point <ButtonRelease-1> "$c dtag selected"
 bind $c <B1-Motion> "plotMove $c %x %y"
 
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/ruler.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/ruler.tcl
index f7bc37b874e..0b783707088 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/ruler.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/ruler.tcl
@@ -77,10 +77,10 @@ $c addtag well withtag [$c create rect 13.2c 1c 13.8c 0.5c \
 $c addtag well withtag [rulerMkTab $c [winfo pixels $c 13.5c] \
 	[winfo pixels $c .65c]]
 
-$c bind well <1> "rulerNewTab $c %x %y"
-$c bind tab <1> "rulerSelectTab $c %x %y"
+$c bind well <Button-1> "rulerNewTab $c %x %y"
+$c bind tab <Button-1> "rulerSelectTab $c %x %y"
 bind $c <B1-Motion> "rulerMoveTab $c %x %y"
-bind $c <Any-ButtonRelease-1> "rulerReleaseTab $c"
+bind $c <ButtonRelease-1> "rulerReleaseTab $c"
 
 # rulerNewTab --
 # Does all the work of creating a tab stop, including creating the
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/tclIndex b/Master/tlpkg/tltcl/lib/tk8.6/demos/tclIndex
index 86a72e2443e..cdb2f2c1c29 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/tclIndex
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/tclIndex
@@ -6,62 +6,62 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(arrowSetup) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove1) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove2) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove3) [list source [file join $dir arrow.tcl]]
-set auto_index(textLoadFile) [list source [file join $dir search.tcl]]
-set auto_index(textSearch) [list source [file join $dir search.tcl]]
-set auto_index(textToggle) [list source [file join $dir search.tcl]]
-set auto_index(itemEnter) [list source [file join $dir items.tcl]]
-set auto_index(itemLeave) [list source [file join $dir items.tcl]]
-set auto_index(itemMark) [list source [file join $dir items.tcl]]
-set auto_index(itemStroke) [list source [file join $dir items.tcl]]
-set auto_index(itemsUnderArea) [list source [file join $dir items.tcl]]
-set auto_index(itemStartDrag) [list source [file join $dir items.tcl]]
-set auto_index(itemDrag) [list source [file join $dir items.tcl]]
-set auto_index(butPress) [list source [file join $dir items.tcl]]
-set auto_index(loadDir) [list source [file join $dir image2.tcl]]
-set auto_index(loadImage) [list source [file join $dir image2.tcl]]
-set auto_index(rulerMkTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerNewTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerSelectTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerMoveTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerReleaseTab) [list source [file join $dir ruler.tcl]]
-set auto_index(mkTextConfig) [list source [file join $dir ctext.tcl]]
-set auto_index(textEnter) [list source [file join $dir ctext.tcl]]
-set auto_index(textInsert) [list source [file join $dir ctext.tcl]]
-set auto_index(textPaste) [list source [file join $dir ctext.tcl]]
-set auto_index(textB1Press) [list source [file join $dir ctext.tcl]]
-set auto_index(textB1Move) [list source [file join $dir ctext.tcl]]
-set auto_index(textBs) [list source [file join $dir ctext.tcl]]
-set auto_index(textDel) [list source [file join $dir ctext.tcl]]
-set auto_index(bitmapRow) [list source [file join $dir bitmap.tcl]]
-set auto_index(scrollEnter) [list source [file join $dir cscroll.tcl]]
-set auto_index(scrollLeave) [list source [file join $dir cscroll.tcl]]
-set auto_index(scrollButton) [list source [file join $dir cscroll.tcl]]
-set auto_index(textWindOn) [list source [file join $dir twind.tcl]]
-set auto_index(textWindOff) [list source [file join $dir twind.tcl]]
-set auto_index(textWindPlot) [list source [file join $dir twind.tcl]]
-set auto_index(embPlotDown) [list source [file join $dir twind.tcl]]
-set auto_index(embPlotMove) [list source [file join $dir twind.tcl]]
-set auto_index(textWindDel) [list source [file join $dir twind.tcl]]
-set auto_index(embDefBg) [list source [file join $dir twind.tcl]]
-set auto_index(floorDisplay) [list source [file join $dir floor.tcl]]
-set auto_index(newRoom) [list source [file join $dir floor.tcl]]
-set auto_index(roomChanged) [list source [file join $dir floor.tcl]]
-set auto_index(bg1) [list source [file join $dir floor.tcl]]
-set auto_index(bg2) [list source [file join $dir floor.tcl]]
-set auto_index(bg3) [list source [file join $dir floor.tcl]]
-set auto_index(fg1) [list source [file join $dir floor.tcl]]
-set auto_index(fg2) [list source [file join $dir floor.tcl]]
-set auto_index(fg3) [list source [file join $dir floor.tcl]]
-set auto_index(setWidth) [list source [file join $dir hscale.tcl]]
-set auto_index(plotDown) [list source [file join $dir plot.tcl]]
-set auto_index(plotMove) [list source [file join $dir plot.tcl]]
-set auto_index(puzzleSwitch) [list source [file join $dir puzzle.tcl]]
-set auto_index(setHeight) [list source [file join $dir vscale.tcl]]
-set auto_index(showMessageBox) [list source [file join $dir msgbox.tcl]]
-set auto_index(setColor) [list source [file join $dir clrpick.tcl]]
-set auto_index(setColor_helper) [list source [file join $dir clrpick.tcl]]
-set auto_index(fileDialog) [list source [file join $dir filebox.tcl]]
+set auto_index(arrowSetup) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(arrowMove1) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(arrowMove2) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(arrowMove3) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(textLoadFile) [list source -encoding utf-8 [file join $dir search.tcl]]
+set auto_index(textSearch) [list source -encoding utf-8 [file join $dir search.tcl]]
+set auto_index(textToggle) [list source -encoding utf-8 [file join $dir search.tcl]]
+set auto_index(itemEnter) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemLeave) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemMark) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemStroke) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemsUnderArea) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemStartDrag) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemDrag) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(butPress) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(loadDir) [list source -encoding utf-8 [file join $dir image2.tcl]]
+set auto_index(loadImage) [list source -encoding utf-8 [file join $dir image2.tcl]]
+set auto_index(rulerMkTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerNewTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerSelectTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerMoveTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerReleaseTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(mkTextConfig) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textEnter) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textInsert) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textPaste) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textB1Press) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textB1Move) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textBs) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textDel) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(bitmapRow) [list source -encoding utf-8 [file join $dir bitmap.tcl]]
+set auto_index(scrollEnter) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
+set auto_index(scrollLeave) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
+set auto_index(scrollButton) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
+set auto_index(textWindOn) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(textWindOff) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(textWindPlot) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(embPlotDown) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(embPlotMove) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(textWindDel) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(embDefBg) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(floorDisplay) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(newRoom) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(roomChanged) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(bg1) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(bg2) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(bg3) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(fg1) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(fg2) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(fg3) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(setWidth) [list source -encoding utf-8 [file join $dir hscale.tcl]]
+set auto_index(plotDown) [list source -encoding utf-8 [file join $dir plot.tcl]]
+set auto_index(plotMove) [list source -encoding utf-8 [file join $dir plot.tcl]]
+set auto_index(puzzleSwitch) [list source -encoding utf-8 [file join $dir puzzle.tcl]]
+set auto_index(setHeight) [list source -encoding utf-8 [file join $dir vscale.tcl]]
+set auto_index(showMessageBox) [list source -encoding utf-8 [file join $dir msgbox.tcl]]
+set auto_index(setColor) [list source -encoding utf-8 [file join $dir clrpick.tcl]]
+set auto_index(setColor_helper) [list source -encoding utf-8 [file join $dir clrpick.tcl]]
+set auto_index(fileDialog) [list source -encoding utf-8 [file join $dir filebox.tcl]]
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/tcolor b/Master/tlpkg/tltcl/lib/tk8.6/demos/tcolor
index 3f34a32f12e..f4be463ad0b 100755
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/tcolor
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/tcolor
@@ -7,7 +7,7 @@ exec wish86 "$0" ${1+"$@"}
 # create colors using either the RGB, HSB, or CYM color spaces
 # and apply the color to existing applications.
 
-package require Tk 8.4
+package require Tk
 wm title . "Color Editor"
 
 # Global variables that control the program:
@@ -90,7 +90,7 @@ foreach i {
     grid columnconfigure . 0 -weight 1
     listbox .names.lb -width 20 -height 12 -yscrollcommand ".names.s set" \
 	-exportselection false
-    bind .names.lb <Double-1> {
+    bind .names.lb <Double-Button-1> {
 	    tc_loadNamedColor [.names.lb get [.names.lb curselection]]
     }
     scrollbar .names.s -orient vertical -command ".names.lb yview"
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/text.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/text.tcl
index d1801d1d856..2736b8835d6 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/text.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/text.tcl
@@ -57,8 +57,9 @@ can do to a text widget:
 
 1. Scrolling. Use the scrollbar to adjust the view in the text window.
 
-2. Scanning. Press mouse button 2 in the text window and drag up or down.
-This will drag the text at high speed to allow you to scan its contents.
+2. Scanning. Press the middle mouse button in the text window and drag up
+or down. This will drag the text at high speed to allow you to scan its
+contents.
 
 3. Insert text. Press mouse button 1 to set the insertion cursor, then
 type text.  What you type will be added to the widget.
@@ -77,7 +78,8 @@ text, in which case it will replace the selected text.
 
 6. Copy the selection. To copy the selection into this window, select
 what you want to copy (either here or in another application), then
-click button 2 to copy the selection to the point of the mouse cursor.
+click the middle mouse button to copy the selection to the point of the
+mouse cursor.
 
 7. Edit.  Text widgets support the standard Motif editing characters
 plus many Emacs editing characters.  Backspace and Control-h erase the
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/tree.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/tree.tcl
index 8decdf26c9b..1cc70f877fa 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/tree.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/tree.tcl
@@ -39,6 +39,7 @@ proc populateTree {tree node} {
     set path [$tree set $node fullpath]
     $tree delete [$tree children $node]
     foreach f [lsort -dictionary [glob -nocomplain -dir $path *]] {
+	set f [file normalize $f]
 	set type [file type $f]
 	set id [$tree insert $node end -text [file tail $f] \
 		-values [list $f $type]]
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/twind.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/twind.tcl
index 45d1da87348..74f11ebf075 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/twind.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/twind.tcl
@@ -265,9 +265,9 @@ proc createPlot {t} {
 	$c addtag point withtag $item
     }
 
-    $c bind point <Any-Enter> "$c itemconfig current -fill red"
-    $c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
-    $c bind point <1> "embPlotDown $c %x %y"
+    $c bind point <Enter> "$c itemconfig current -fill red"
+    $c bind point <Leave> "$c itemconfig current -fill SkyBlue2"
+    $c bind point <Button-1> "embPlotDown $c %x %y"
     $c bind point <ButtonRelease-1> "$c dtag selected"
     bind $c <B1-Motion> "embPlotMove $c %x %y"
     return $c
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/unicodeout.tcl b/Master/tlpkg/tltcl/lib/tk8.6/demos/unicodeout.tcl
index 811d2109ab7..759dc0006b7 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/unicodeout.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/unicodeout.tcl
@@ -109,10 +109,10 @@ if {[usePresentationFormsFor Arabic]} {
 }
 addSample $w "Trad. Chinese"  "\u4E2D\u570B\u7684\u6F22\u5B57"
 addSample $w "Simpl. Chinese" "\u6C49\u8BED"
-addSample $w French "Langue fran\u00E7aise"
+addSample $w French "Langue fran\xE7aise"
 addSample $w Greek \
-	 "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
-	 "\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
+	"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
+	"\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
 if {[usePresentationFormsFor Hebrew]} {
     # Visual order (pre-layouted)
     addSample $w Hebrew \
@@ -123,17 +123,21 @@ if {[usePresentationFormsFor Hebrew]} {
 	    "\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA"
 }
 addSample $w Hindi \
-    "\u0939\u093f\u0928\u094d\u0926\u0940 \u092d\u093e\u0937\u093e"
-addSample $w Icelandic "\u00CDslenska"
+    "\u0939\u093F\u0928\u094D\u0926\u0940 \u092D\u093E\u0937\u093E"
+addSample $w Icelandic "\xCDslenska"
 addSample $w Japanese \
-	 "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
-	 "\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
+	"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
+	"\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
 addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
 addSample $w Russian \
 	"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
-if {[tk windowingsystem] ne "x11"} {
-    addSample $w Emoji \
-	    "\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
+if {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} {
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	addSample $w Emoji "😀💩👍🇳🇱"
+    } else {
+	addSample $w Emoji \
+		"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
+    }
 }
 
 ## We're done processing, so change things back to normal running...
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/demos/widget b/Master/tlpkg/tltcl/lib/tk8.6/demos/widget
index 91c3e5fd5c1..774125a13ed 100755
--- a/Master/tlpkg/tltcl/lib/tk8.6/demos/widget
+++ b/Master/tlpkg/tltcl/lib/tk8.6/demos/widget
@@ -83,12 +83,20 @@ image create photo ::img::print -format GIF -data {
 
 # Note that this is run through the message catalog! This is because this is
 # actually an image of a word.
-image create photo ::img::new -format GIF -data [mc {
-    R0lGODlhHgAOALMPALMAANyIiOu7u8dEROaqqvru7sxVVeGZmbgREfXd3b0iItZ3
-    d8IzM9FmZvDMzP///yH5BAEAAA8ALAAAAAAeAA4AAASa8MlJq7046827WVOCHEkw
-    nANhUgJlEBIABJIwL3K+4IcUALCHjfbItYZDSgJgkBiYPmBMAUAkkLPKs/BAyLgM
-    wAQwOAAY2ByCaw4QAFQSoDEePJ6DmU1xInYZTw5nOEFFdgVUelkVDTIMd3AKFGQ1
-    MgI2AwEmQW8APZ0gdRONAks5nhIFVVxdAAkUAS2pAVwFl7ITB4UqHb0XEQA7
+image create photo ::img::new -format PNG -data [mc {
+    iVBORw0KGgoAAAANSUhEUgAAAB4AAAAOCAYAAAA45qw5AAACMElEQVR4AeVTAwxd
+    QRCc2tZHGtQ2w9q2bdsOa9u2bUW1bdt2Z372JZe6DapJLqtb3h7+T8yKi5j4CsYD
+    EUQXxETclT7kWOlH2VV+tFkdQHPSwksSISF+BauCqL0qgOcMWgGfgEkaMsHxqUBk
+    3plE/sOnh/qDPAPJH/CKFBivGHWzFwBRnHhlqbu1Mh6CoFNnC/JshQ9p4YC2lrKt
+    DCAV+THiVejyhMjAbrNSrroiEfKR9g7ZfCgOog8QfnUQV62wAk68ndQ9ZbyoWO1H
+    Y6eDY1LCQL6a9ApOp9Hi1T0+gQq2JKMlky/oTKQliKWxEZvyG575kpW4pl1aZnQK
+    CLOVt45Lkp8uXp2SL8KO6uitNTZLdpK6s+I/eZbhpmsmWeOGOVQNKYLITzpKPAO3
+    tY7LSNZ7ccSLxX9y3uuOxRkg3dKESMoCHvL+GRVCutXsB3guLgDCeXOv4iWWkvwG
+    BaS+PmlpK6SI9ApI2oC2UtrwZQEkhkH+NtolVlQXJl1I+QltuU3XEc721bIRFpa8
+    IA5iqTo6vNNWmkNBLQbPeXwF2g17Q94nTQAfY3YzeY+WSu8MDzQ2kpELUhSGJUHE
+    0zeR3rY1L+Xl5G/re+jbiK6KhThwwInsts1fbMUUcpZszKeVtggZEiGdZDe5AtHh
+    7vL4CGiRvvKPS8FAvq9Nr4ZkFadR2y6kggu1z4vlyIbBp6BugQ8JLEg4bTkD9eMZ
+    QZ8hpJ3VvTtuvbWrY/ElvP/9R+Aj3603+iE3fkEAAAAASUVORK5CYII=
 }]
 
 #----------------------------------------------------------------
@@ -186,6 +194,10 @@ if {[winfo depth .] == 1} {
 	-foreground blue -underline 1
     .t tag configure visited -lmargin1 1c -lmargin2 1c \
 	-foreground #303080 -underline 1
+    if {[tk windowingsystem] eq "aqua"} {
+	.t tag configure demo -foreground systemLinkColor
+	.t tag configure visited -foreground purple
+    }
     .t tag configure hot -foreground red -underline 1
 }
 .t tag bind demo <ButtonRelease-1> {
@@ -504,7 +516,7 @@ proc invoke index {
     .t configure -cursor [::ttk::cursor busy]
     update
     set demo [string range [lindex $tags $i] 5 end]
-    uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]]
+    uplevel 1 [list source -encoding utf-8 [file join $tk_demoDirectory $demo.tcl]]
     update
     .t configure -cursor $cursor
 
@@ -612,6 +624,7 @@ proc showCode w {
     wm title $top [mc "Demo code: %s" [file join $tk_demoDirectory $file]]
     wm iconname $top $file
     set id [open [file join $tk_demoDirectory $file]]
+    fconfigure $id -encoding utf-8 -eofchar \032
     $top.f.text delete 1.0 end
     $top.f.text insert 1.0 [read $id]
     $top.f.text mark set insert 1.0
@@ -710,10 +723,10 @@ proc PrintTextWin32 {filename} {
 proc tkAboutDialog {} {
     tk_messageBox -icon info -type ok -title [mc "About Widget Demo"] \
 	    -message [mc "Tk widget demonstration application"] -detail \
-"[mc "Copyright \u00a9 %s" {1996-1997 Sun Microsystems, Inc.}]
-[mc "Copyright \u00a9 %s" {1997-2000 Ajuba Solutions, Inc.}]
-[mc "Copyright \u00a9 %s" {2001-2009 Donal K. Fellows}]
-[mc "Copyright \u00a9 %s" {2002-2007 Daniel A. Steffen}]"
+"[mc "Copyright \xA9 %s" {1996-1997 Sun Microsystems, Inc.}]
+[mc "Copyright \xA9 %s" {1997-2000 Ajuba Solutions, Inc.}]
+[mc "Copyright \xA9 %s" {2001-2009 Donal K. Fellows}]
+[mc "Copyright \xA9 %s" {2002-2007 Daniel A. Steffen}]"
 }
 
 # Local Variables:
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/entry.tcl b/Master/tlpkg/tltcl/lib/tk8.6/entry.tcl
index 2aab9342378..6539af777df 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/entry.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/entry.tcl
@@ -58,7 +58,7 @@ bind Entry <<Paste>> {
 }
 bind Entry <<Clear>> {
     # ignore if there is no selection
-    catch { %W delete sel.first sel.last }
+    catch {%W delete sel.first sel.last}
 }
 bind Entry <<PasteSelection>> {
     if {$tk_strictMotif || ![info exists tk::Priv(mouseMoved)]
@@ -74,7 +74,7 @@ bind Entry <<TraverseIn>> {
 
 # Standard Motif bindings:
 
-bind Entry <1> {
+bind Entry <Button-1> {
     tk::EntryButton1 %W %x
     %W selection clear
 }
@@ -82,25 +82,25 @@ bind Entry <B1-Motion> {
     set tk::Priv(x) %x
     tk::EntryMouseSelect %W %x
 }
-bind Entry <Double-1> {
+bind Entry <Double-Button-1> {
     set tk::Priv(selectMode) word
     tk::EntryMouseSelect %W %x
     catch {%W icursor sel.last}
 }
-bind Entry <Triple-1> {
+bind Entry <Triple-Button-1> {
     set tk::Priv(selectMode) line
     tk::EntryMouseSelect %W %x
     catch {%W icursor sel.last}
 }
-bind Entry <Shift-1> {
+bind Entry <Shift-Button-1> {
     set tk::Priv(selectMode) char
     %W selection adjust @%x
 }
-bind Entry <Double-Shift-1>	{
+bind Entry <Double-Shift-Button-1>	{
     set tk::Priv(selectMode) word
     tk::EntryMouseSelect %W %x
 }
-bind Entry <Triple-Shift-1>	{
+bind Entry <Triple-Shift-Button-1>	{
     set tk::Priv(selectMode) line
     tk::EntryMouseSelect %W %x
 }
@@ -114,22 +114,22 @@ bind Entry <B1-Enter> {
 bind Entry <ButtonRelease-1> {
     tk::CancelRepeat
 }
-bind Entry <Control-1> {
+bind Entry <Control-Button-1> {
     %W icursor @%x
 }
 
 bind Entry <<PrevChar>> {
-    tk::EntrySetCursor %W [expr {[%W index insert] - 1}]
+    tk::EntrySetCursor %W [expr {[%W index insert]-1}]
 }
 bind Entry <<NextChar>> {
-    tk::EntrySetCursor %W [expr {[%W index insert] + 1}]
+    tk::EntrySetCursor %W [expr {[%W index insert]+1}]
 }
 bind Entry <<SelectPrevChar>> {
-    tk::EntryKeySelect %W [expr {[%W index insert] - 1}]
+    tk::EntryKeySelect %W [expr {[%W index insert]-1}]
     tk::EntrySeeInsert %W
 }
 bind Entry <<SelectNextChar>> {
-    tk::EntryKeySelect %W [expr {[%W index insert] + 1}]
+    tk::EntryKeySelect %W [expr {[%W index insert]+1}]
     tk::EntrySeeInsert %W
 }
 bind Entry <<PrevWord>> {
@@ -190,19 +190,19 @@ bind Entry <<SelectAll>> {
 bind Entry <<SelectNone>> {
     %W selection clear
 }
-bind Entry <KeyPress> {
+bind Entry <Key> {
     tk::CancelRepeat
     tk::EntryInsert %W %A
 }
 
 # Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
 # Otherwise, if a widget binding for one of these is defined, the
-# <KeyPress> class binding will also fire and insert the character,
+# <Key> class binding will also fire and insert the character,
 # which is wrong.  Ditto for Escape, Return, and Tab.
 
-bind Entry <Alt-KeyPress> {# nothing}
-bind Entry <Meta-KeyPress> {# nothing}
-bind Entry <Control-KeyPress> {# nothing}
+bind Entry <Alt-Key> {# nothing}
+bind Entry <Meta-Key> {# nothing}
+bind Entry <Control-Key> {# nothing}
 bind Entry <Escape> {# nothing}
 bind Entry <Return> {# nothing}
 bind Entry <KP_Enter> {# nothing}
@@ -210,7 +210,7 @@ bind Entry <Tab> {# nothing}
 bind Entry <Prior> {# nothing}
 bind Entry <Next> {# nothing}
 if {[tk windowingsystem] eq "aqua"} {
-    bind Entry <Command-KeyPress> {# nothing}
+    bind Entry <Command-Key> {# nothing}
 }
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind Entry <<NextLine>> {# nothing}
@@ -278,7 +278,7 @@ bind Entry <<TkStartIMEMarkedText>> {
     dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
 }
 bind Entry <<TkEndIMEMarkedText>> {
-    if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
+    if {[catch {dict get $::tk::Priv(IMETextMark) "%W"} mark]} {
 	bell
     } else {
 	%W selection range $mark insert
@@ -293,14 +293,27 @@ bind Entry <<TkAccentBackspace>> {
 
 # A few additional bindings of my own.
 
-bind Entry <2> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanMark %W %x
+if {[tk windowingsystem] ne "aqua"} {
+    bind Entry <Button-2> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanMark %W %x
+        }
     }
-}
-bind Entry <B2-Motion> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanDrag %W %x
+    bind Entry <B2-Motion> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanDrag %W %x
+        }
+    }
+} else {
+    bind Entry <Button-3> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanMark %W %x
+        }
+    }
+    bind Entry <B3-Motion> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanDrag %W %x
+        }
     }
 }
 
@@ -378,10 +391,10 @@ proc ::tk::EntryMouseSelect {w x} {
 	word {
 	    if {$cur < $anchor} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
+		set after [tcl_wordBreakAfter [$w get] $anchor-1]
 	    } elseif {$cur > $anchor} {
 		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
+		set after [tcl_wordBreakAfter [$w get] $cur-1]
 	    } else {
 		if {[$w index @$Priv(pressX)] < $anchor} {
 		      incr anchor -1
@@ -505,9 +518,9 @@ proc ::tk::EntryBackspace w {
     if {[$w selection present]} {
 	$w delete sel.first sel.last
     } else {
-	set x [expr {[$w index insert] - 1}]
-	if {$x >= 0} {
-	    $w delete $x
+	set x [$w index insert]
+	if {$x > 0} {
+	    $w delete [expr {$x-1}]
 	}
 	if {[$w index @0] >= [$w index insert]} {
 	    set range [$w xview]
@@ -562,12 +575,12 @@ proc ::tk::EntryTranspose w {
     if {$i < [$w index end]} {
 	incr i
     }
-    set first [expr {$i-2}]
-    if {$first < 0} {
+    if {$i < 2} {
 	return
     }
+    set first [expr {$i-2}]
     set data [$w get]
-    set new [string index $data [expr {$i-1}]][string index $data $first]
+    set new [string index $data $i-1][string index $data $first]
     $w delete $first $i
     $w insert insert $new
     EntrySeeInsert $w
@@ -647,7 +660,7 @@ proc ::tk::EntryScanMark {w x} {
 proc ::tk::EntryScanDrag {w x} {
     # Make sure these exist, as some weird situations can trigger the
     # motion binding without the initial press.  [Bug #220269]
-    if {![info exists ::tk::Priv(x)]} { set ::tk::Priv(x) $x }
+    if {![info exists ::tk::Priv(x)]} {set ::tk::Priv(x) $x}
     # allow for a delta
     if {abs($x-$::tk::Priv(x)) > 2} {
 	set ::tk::Priv(mouseMoved) 1
@@ -664,19 +677,10 @@ proc ::tk::EntryScanDrag {w x} {
 
 proc ::tk::EntryGetSelection {w} {
     set entryString [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
+	    [$w index sel.last]-1]
     if {[$w cget -show] ne ""} {
 	return [string repeat [string index [$w cget -show] 0] \
 		[string length $entryString]]
     }
     return $entryString
 }
-
-
-
-
-
-
-
-
-
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/fontchooser.tcl b/Master/tlpkg/tltcl/lib/tk8.6/fontchooser.tcl
index 5395acb8461..9d49c574e41 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/fontchooser.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/fontchooser.tcl
@@ -14,11 +14,11 @@ namespace eval ::tk::fontchooser {
     set S(W) .__tk__fontchooser
     set S(fonts) [lsort -dictionary [font families]]
     set S(styles) [list \
-                       [::msgcat::mc "Regular"] \
-                       [::msgcat::mc "Italic"] \
-                       [::msgcat::mc "Bold"] \
-                       [::msgcat::mc "Bold Italic"] \
-                      ]
+	[::msgcat::mc "Regular"] \
+	[::msgcat::mc "Italic"] \
+	[::msgcat::mc "Bold"] \
+	[::msgcat::mc "Bold Italic"] \
+    ]
 
     set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72}
     set S(strike) 0
@@ -36,9 +36,9 @@ proc ::tk::fontchooser::Setup {} {
 
     # Canonical versions of font families, styles, etc. for easier searching
     set S(fonts,lcase) {}
-    foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]}
+    foreach font $S(fonts) {lappend S(fonts,lcase) [string tolower $font]}
     set S(styles,lcase) {}
-    foreach style $S(styles) { lappend S(styles,lcase) [string tolower $style]}
+    foreach style $S(styles) {lappend S(styles,lcase) [string tolower $style]}
     set S(sizes,lcase) $S(sizes)
 
     ::ttk::style layout FontchooserFrame {
@@ -111,7 +111,7 @@ proc ::tk::fontchooser::Configure {args} {
 
     set cache [dict create -parent $S(-parent) -title $S(-title) \
                    -font $S(-font) -command $S(-command)]
-    set r [tclParseConfigSpec [namespace which -variable S] $specs "" $args]
+    set r [tclParseConfigSpec [namespace which -variable S] $specs DONTSETDEFAULTS $args]
     if {![winfo exists $S(-parent)]} {
 	set code [list TK LOOKUP WINDOW $S(-parent)]
         set err "bad window path name \"$S(-parent)\""
@@ -121,7 +121,7 @@ proc ::tk::fontchooser::Configure {args} {
     if {[string trim $S(-title)] eq ""} {
         set S(-title) [::msgcat::mc "Font"]
     }
-    if {[winfo exists $S(W)] && [lsearch $args -font] != -1} {
+    if {[winfo exists $S(W)] && ("-font" in $args)} {
 	Init $S(-font)
 	event generate $S(-parent) <<TkFontchooserFontChanged>>
     }
@@ -145,10 +145,13 @@ proc ::tk::fontchooser::Create {} {
         wm title $S(W) $S(-title)
         wm transient $S(W) [winfo toplevel $S(-parent)]
 
+        set scaling [tk scaling]
+        set sizeWidth [expr {int([string length [::msgcat::mc "&Size:"]] * $scaling)}]
+
         set outer [::ttk::frame $S(W).outer -padding {10 10}]
         ::tk::AmpWidget ::ttk::label $S(W).font -text [::msgcat::mc "&Font:"]
         ::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"]
-        ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"]
+        ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"] -width $sizeWidth
         ttk::entry $S(W).efont -width 18 \
             -textvariable [namespace which -variable S](font)
         ttk::entry $S(W).estyle -width 10 \
@@ -199,7 +202,7 @@ proc ::tk::fontchooser::Create {} {
         set minsize(sizes) \
             [expr {[font measure TkDefaultFont "-99"] + $scroll_width}]
         set min [expr {$minsize(gap) * 4}]
-        foreach {what width} [array get minsize] { incr min $width }
+        foreach {what width} [array get minsize] {incr min $width}
         wm minsize $S(W) $min 260
 
         bind $S(W) <Return> [namespace code [list Done 1]]
@@ -277,7 +280,7 @@ proc ::tk::fontchooser::Create {} {
 # Arguments:
 #       ok              true if user pressed OK
 #
-proc ::tk::::fontchooser::Done {ok} {
+proc ::tk::fontchooser::Done {ok} {
     variable S
 
     if {! $ok} {
@@ -327,13 +330,13 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} {
         set S(size) $F(-size)
         set S(strike) $F(-overstrike)
         set S(under) $F(-underline)
-        set S(style) "Regular"
+        set S(style) [::msgcat::mc "Regular"]
         if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} {
-            set S(style) "Bold Italic"
+            set S(style) [::msgcat::mc "Bold Italic"]
         } elseif {$F(-weight) eq "bold"} {
-            set S(style) "Bold"
+            set S(style) [::msgcat::mc "Bold"]
         } elseif {$F(-slant) eq "italic"} {
-            set S(style) "Italic"
+            set S(style) [::msgcat::mc "Italic"]
         }
 
         set S(first) 0
@@ -381,7 +384,7 @@ proc ::tk::fontchooser::Tracer {var1 var2 op} {
         $S(W).l${var}s selection clear 0 end
         set n [lsearch -exact $S(${var}s,lcase) $value]
         $S(W).l${var}s selection set $n
-        if {$n != -1} {
+        if {$n >= 0} {
             set S($var) [lindex $S(${var}s) $n]
             $S(W).e$var icursor end
             $S(W).e$var selection clear
@@ -396,7 +399,7 @@ proc ::tk::fontchooser::Tracer {var1 var2 op} {
         }
         $S(W).l${var}s see $n
     }
-    if {!$bad} { Update }
+    if {!$bad} {Update}
     $S(W).ok configure -state $nstate
 }
 
@@ -408,11 +411,11 @@ proc ::tk::fontchooser::Update {} {
     variable S
 
     set S(result) [list $S(font) $S(size)]
-    if {$S(style) eq "Bold"} { lappend S(result) bold }
-    if {$S(style) eq "Italic"} { lappend S(result) italic }
-    if {$S(style) eq "Bold Italic"} { lappend S(result) bold italic}
-    if {$S(strike)} { lappend S(result) overstrike}
-    if {$S(under)} { lappend S(result) underline}
+    if {$S(style) eq [::msgcat::mc "Bold"]} {lappend S(result) bold}
+    if {$S(style) eq [::msgcat::mc "Italic"]} {lappend S(result) italic}
+    if {$S(style) eq [::msgcat::mc "Bold Italic"]} {lappend S(result) bold italic}
+    if {$S(strike)} {lappend S(result) overstrike}
+    if {$S(under)} {lappend S(result) underline}
 
     $S(sample) configure -font $S(result)
 }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/iconlist.tcl b/Master/tlpkg/tltcl/lib/tk8.6/iconlist.tcl
index eed7476772e..34b19d02662 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/iconlist.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/iconlist.tcl
@@ -26,7 +26,7 @@
 #	<path> selection includes <item>
 #	<path> selection set <first> ?<last>?
 
-package require Tk 8.6
+package require Tk
 
 ::tk::Megawidget create ::tk::IconList ::tk::FocusableWidget {
     variable w canvas sbar accel accelCB fill font index \
@@ -697,7 +697,7 @@ package require Tk 8.6
 	    }
 	}
 
-	if {$theIndex > -1} {
+	if {$theIndex >= 0} {
 	    $w selection clear 0 end
 	    $w selection set $theIndex
 	    $w selection anchor $theIndex
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/listbox.tcl b/Master/tlpkg/tltcl/lib/tk8.6/listbox.tcl
index a0948838046..9e628a83fcd 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/listbox.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/listbox.tcl
@@ -311,13 +311,13 @@ proc ::tk::ListboxMotion {w el} {
 		set Priv(listboxSelection) [$w curselection]
 	    }
 	    while {($i < $el) && ($i < $anchor)} {
-		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
+		if {$i in $Priv(listboxSelection)} {
 		    $w selection set $i
 		}
 		incr i
 	    }
 	    while {($i > $el) && ($i > $anchor)} {
-		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
+		if {$i in $Priv(listboxSelection)} {
 		    $w selection set $i
 		}
 		incr i -1
@@ -517,7 +517,7 @@ proc ::tk::ListboxCancel w {
     }
     $w selection clear $first $last
     while {$first <= $last} {
-	if {[lsearch $Priv(listboxSelection) $first] >= 0} {
+	if {$first in $Priv(listboxSelection)} {
 	    $w selection set $first
 	}
 	incr first
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/megawidget.tcl b/Master/tlpkg/tltcl/lib/tk8.6/megawidget.tcl
index aeb1263a8c7..ec9f469adfe 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/megawidget.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/megawidget.tcl
@@ -10,7 +10,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 
-package require Tk 8.6
+package require Tk
 
 ::oo::class create ::tk::Megawidget {
     superclass ::oo::class
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/menu.tcl b/Master/tlpkg/tltcl/lib/tk8.6/menu.tcl
index 9d6370a6ea7..c4991f81166 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/menu.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/menu.tcl
@@ -138,7 +138,7 @@ bind Menu <Leave> {
 bind Menu <Motion> {
     tk::MenuMotion %W %x %y %s
 }
-bind Menu <ButtonPress> {
+bind Menu <Button> {
     tk::MenuButtonDown %W
 }
 bind Menu <ButtonRelease> {
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/pkgIndex.tcl b/Master/tlpkg/tltcl/lib/tk8.6/pkgIndex.tcl
index fcabf1128d9..e8a905f7bef 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/pkgIndex.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/pkgIndex.tcl
@@ -1,7 +1,7 @@
 if {[catch {package present Tcl 8.6.0}]} return
 if {($::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)]
 	|| ([info exists ::argv] && ("-display" in $::argv)))} {
-    package ifneeded Tk 8.6.10 [list load [file normalize [file join $dir .. .. bin libtk8.6.dll]] Tk]
+    package ifneeded Tk 8.6.11 [list load [file normalize [file join $dir .. .. bin libtk8.6.dll]] Tk]
 } else {
-    package ifneeded Tk 8.6.10 [list load [file normalize [file join $dir .. .. bin tk86.dll]] Tk]
+    package ifneeded Tk 8.6.11 [list load [file normalize [file join $dir .. .. bin tk86.dll]] Tk]
 }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/safetk.tcl b/Master/tlpkg/tltcl/lib/tk8.6/safetk.tcl
index 9f8e25d094c..9e71cc65bf4 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/safetk.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/safetk.tcl
@@ -14,9 +14,9 @@
 # Note: It is now ok to let untrusted code being executed
 #       between the creation of the interp and the actual loading
 #       of Tk in that interp because the C side Tk_Init will
-#       now look up the master interp and ask its safe::TkInit
+#       now look up the parent interp and ask its safe::TkInit
 #       for the actual parameters to use for it's initialization (if allowed),
-#       not relying on the slave state.
+#       not relying on the child state.
 #
 
 # We use opt (optional arguments parsing)
@@ -29,31 +29,31 @@ namespace eval ::safe {
 }
 
 #
-# tkInterpInit : prepare the slave interpreter for tk loading
+# tkInterpInit : prepare the child interpreter for tk loading
 #                most of the real job is done by loadTk
-# returns the slave name (tkInterpInit does)
+# returns the child name (tkInterpInit does)
 #
-proc ::safe::tkInterpInit {slave argv} {
+proc ::safe::tkInterpInit {child argv} {
     global env tk_library
 
     # We have to make sure that the tk_library variable is normalized.
     set tk_library [file normalize $tk_library]
 
     # Clear Tk's access for that interp (path).
-    allowTk $slave $argv
+    allowTk $child $argv
 
     # Ensure tk_library and subdirs (eg, ttk) are on the access path
-    ::interp eval $slave [list set tk_library [::safe::interpAddToAccessPath $slave $tk_library]]
+    ::interp eval $child [list set tk_library [::safe::interpAddToAccessPath $child $tk_library]]
     foreach subdir [::safe::AddSubDirs [list $tk_library]] {
-	::safe::interpAddToAccessPath $slave $subdir
+	::safe::interpAddToAccessPath $child $subdir
     }
-    return $slave
+    return $child
 }
 
 
 # tkInterpLoadTk:
 # Do additional configuration as needed (calling tkInterpInit)
-# and actually load Tk into the slave.
+# and actually load Tk into the child.
 #
 # Either contained in the specified windowId (-use) or
 # creating a decorated toplevel for it.
@@ -62,37 +62,37 @@ proc ::safe::tkInterpInit {slave argv} {
 proc ::safe::loadTk {} {}
 
 ::tcl::OptProc ::safe::loadTk {
-    {slave -interp "name of the slave interpreter"}
+    {child -interp "name of the child interpreter"}
     {-use  -windowId {} "window Id to use (new toplevel otherwise)"}
     {-display -displayName {} "display name to use (current one otherwise)"}
 } {
     set displayGiven [::tcl::OptProcArgGiven "-display"]
     if {!$displayGiven} {
 	# Try to get the current display from "."
-	# (which might not exist if the master is tk-less)
+	# (which might not exist if the parent is tk-less)
 	if {[catch {set display [winfo screen .]}]} {
 	    if {[info exists ::env(DISPLAY)]} {
 		set display $::env(DISPLAY)
 	    } else {
-		Log $slave "no winfo screen . nor env(DISPLAY)" WARNING
+		Log $child "no winfo screen . nor env(DISPLAY)" WARNING
 		set display ":0.0"
 	    }
 	}
     }
 
     # Get state for access to the cleanupHook.
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe S$child state
 
     if {![::tcl::OptProcArgGiven "-use"]} {
 	# create a decorated toplevel
-	lassign [tkTopLevel $slave $display] w use
+	lassign [tkTopLevel $child $display] w use
 
-	# set our delete hook (slave arg is added by interpDelete)
-	# to clean up both window related code and tkInit(slave)
+	# set our delete hook (child arg is added by interpDelete)
+	# to clean up both window related code and tkInit(child)
 	set state(cleanupHook) [list tkDelete {} $w]
     } else {
-	# set our delete hook (slave arg is added by interpDelete)
-	# to clean up tkInit(slave)
+	# set our delete hook (child arg is added by interpDelete)
+	# to clean up tkInit(child)
 	set state(cleanupHook) [list disallowTk]
 
 	# Let's be nice and also accept tk window names instead of ids
@@ -122,12 +122,12 @@ proc ::safe::loadTk {} {}
 	}
     }
 
-    # Prepares the slave for tk with those parameters
-    tkInterpInit $slave [list "-use" $use "-display" $display]
+    # Prepares the child for tk with those parameters
+    tkInterpInit $child [list "-use" $use "-display" $display]
 
-    load {} Tk $slave
+    load {} Tk $child
 
-    return $slave
+    return $child
 }
 
 proc ::safe::TkInit {interpPath} {
@@ -149,7 +149,7 @@ proc ::safe::TkInit {interpPath} {
 #	safe::TkInit.
 #
 # Arguments:
-#	interpPath	slave interpreter handle
+#	interpPath	child interpreter handle
 #	argv		arguments passed to safe::TkInterpInit
 #
 # Results:
@@ -168,7 +168,7 @@ proc ::safe::allowTk {interpPath argv} {
 #	in safe::TkInit.
 #
 # Arguments:
-#	interpPath	slave interpreter handle
+#	interpPath	child interpreter handle
 #
 # Results:
 #	none.
@@ -188,43 +188,43 @@ proc ::safe::disallowTk {interpPath} {
 #	Clean up the window associated with the interp being deleted.
 #
 # Arguments:
-#	interpPath	slave interpreter handle
+#	interpPath	child interpreter handle
 #
 # Results:
 #	none.
 
-proc ::safe::tkDelete {W window slave} {
+proc ::safe::tkDelete {W window child} {
 
     # we are going to be called for each widget... skip untill it's
     # top level
 
-    Log $slave "Called tkDelete $W $window" NOTICE
-    if {[::interp exists $slave]} {
-	if {[catch {::safe::interpDelete $slave} msg]} {
-	    Log $slave "Deletion error : $msg"
+    Log $child "Called tkDelete $W $window" NOTICE
+    if {[::interp exists $child]} {
+	if {[catch {::safe::interpDelete $child} msg]} {
+	    Log $child "Deletion error : $msg"
 	}
     }
     if {[winfo exists $window]} {
-	Log $slave "Destroy toplevel $window" NOTICE
+	Log $child "Destroy toplevel $window" NOTICE
 	destroy $window
     }
 
-    # clean up tkInit(slave)
-    disallowTk $slave
+    # clean up tkInit(child)
+    disallowTk $child
     return
 }
 
-proc ::safe::tkTopLevel {slave display} {
+proc ::safe::tkTopLevel {child display} {
     variable tkSafeId
     incr tkSafeId
     set w ".safe$tkSafeId"
     if {[catch {toplevel $w -screen $display -class SafeTk} msg]} {
 	return -code error -errorcode {TK TOPLEVEL SAFE} \
-	    "Unable to create toplevel for safe slave \"$slave\" ($msg)"
+	    "Unable to create toplevel for \"$child\" ($msg)"
     }
-    Log $slave "New toplevel $w" NOTICE
+    Log $child "New toplevel $w" NOTICE
 
-    set msg "Untrusted Tcl applet ($slave)"
+    set msg "Untrusted Tcl applet ($child)"
     wm title $w $msg
 
     # Control frame (we must create a style for it)
@@ -236,7 +236,7 @@ proc ::safe::tkTopLevel {slave display} {
 
     # We will destroy the interp when the window is destroyed
     bindtags $wc [concat Safe$wc [bindtags $wc]]
-    bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $slave]
+    bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $child]
 
     ttk::label $wc.l -text $msg -anchor w
 
@@ -247,7 +247,7 @@ proc ::safe::tkTopLevel {slave display} {
     # but still have the default background instead of red one from the parent
     ttk::frame  $wc.fb -borderwidth 0
     ttk::button $wc.fb.b -text "Delete" \
-	    -command [list ::safe::tkDelete $w $w $slave]
+	    -command [list ::safe::tkDelete $w $w $child]
     pack $wc.fb.b -side right -fill both
     pack $wc.fb -side right -fill both -expand 1
     pack $wc.l -side left -fill both -expand 1 -ipady 2
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/spinbox.tcl b/Master/tlpkg/tltcl/lib/tk8.6/spinbox.tcl
index 1965ed879b0..2b387d2afa0 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/spinbox.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/spinbox.tcl
@@ -280,14 +280,27 @@ bind Spinbox <Meta-Delete> {
 
 # A few additional bindings of my own.
 
-bind Spinbox <2> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanMark %W %x
+if {[tk windowingsystem] ne "aqua"} {
+    bind Spinbox <2> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanMark %W %x
+        }
     }
-}
-bind Spinbox <B2-Motion> {
-    if {!$tk_strictMotif} {
-	::tk::EntryScanDrag %W %x
+    bind Spinbox <B2-Motion> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanDrag %W %x
+        }
+    }
+} else {
+    bind Spinbox <3> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanMark %W %x
+        }
+    }
+    bind Spinbox <B3-Motion> {
+        if {!$tk_strictMotif} {
+        ::tk::EntryScanDrag %W %x
+        }
     }
 }
 
@@ -470,10 +483,10 @@ proc ::tk::spinbox::MouseSelect {w x {cursor {}}} {
 	word {
 	    if {$cur < [$w index anchor]} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
+		set after [tcl_wordBreakAfter [$w get] $anchor-1]
 	    } else {
 		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
+		set after [tcl_wordBreakAfter [$w get] $cur-1]
 	    }
 	    if {$before < 0} {
 		set before 0
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/tearoff.tcl b/Master/tlpkg/tltcl/lib/tk8.6/tearoff.tcl
index b500023782b..dece4dffc55 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/tearoff.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/tearoff.tcl
@@ -39,7 +39,7 @@ proc ::tk::TearOffMenu {w {x 0} {y 0}} {
 	    # Shift by height of tearoff entry minus height of window titlebar
 	    catch {incr y [expr {[$w yposition 1] - 16}]}
 	    # Avoid the native menu bar which sits on top of everything.
-	    if {$y < 22} { set y 22 }
+	    if {$y < 22} {set y 22}
 	}
     }
 
@@ -153,9 +153,11 @@ proc ::tk::MenuDup {src dst type} {
 
     # Copy tags to x, replacing each substring of src with dst.
 
-    while {[set index [string first $src $tags]] != -1} {
-	append x [string range $tags 0 [expr {$index - 1}]]$dst
-	set tags [string range $tags [expr {$index + $srcLen}] end]
+    while {[set index [string first $src $tags]] >= 0} {
+	if {$index > 0} {
+	    append x [string range $tags 0 $index-1]$dst
+	}
+	set tags [string range $tags $index+$srcLen end]
     }
     append x $tags
 
@@ -168,10 +170,12 @@ proc ::tk::MenuDup {src dst type} {
 
 	# Copy script to x, replacing each substring of event with dst.
 
-	while {[set index [string first $event $script]] != -1} {
-	    append x [string range $script 0 [expr {$index - 1}]]
+	while {[set index [string first $event $script]] >= 0} {
+	    if {$index > 0} {
+		append x [string range $script 0 $index-1]
+	    }
 	    append x $dst
-	    set script [string range $script [expr {$index + $eventLen}] end]
+	    set script [string range $script $index+$eventLen end]
 	}
 	append x $script
 
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/text.tcl b/Master/tlpkg/tltcl/lib/tk8.6/text.tcl
index bdfb78e51e8..ec8f3d3538d 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/text.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/text.tcl
@@ -429,14 +429,27 @@ bind Text <Control-h> {
 	%W see insert
     }
 }
-bind Text <2> {
-    if {!$tk_strictMotif} {
-	tk::TextScanMark %W %x %y
+if {[tk windowingsystem] ne "aqua"} {
+    bind Text <2> {
+        if {!$tk_strictMotif} {
+        tk::TextScanMark %W %x %y
+        }
     }
-}
-bind Text <B2-Motion> {
-    if {!$tk_strictMotif} {
-	tk::TextScanDrag %W %x %y
+    bind Text <B2-Motion> {
+        if {!$tk_strictMotif} {
+        tk::TextScanDrag %W %x %y
+        }
+    }
+} else {
+    bind Text <3> {
+        if {!$tk_strictMotif} {
+        tk::TextScanMark %W %x %y
+        }
+    }
+    bind Text <B3-Motion> {
+        if {!$tk_strictMotif} {
+        tk::TextScanDrag %W %x %y
+        }
     }
 }
 set ::tk::Priv(prevPos) {}
@@ -558,12 +571,7 @@ proc ::tk::TextButton1 {w x y} {
     } else {
 	$w mark gravity $anchorname left
     }
-    # Allow focus in any case on Windows, because that will let the
-    # selection be displayed even for state disabled text widgets.
-    if {[tk windowingsystem] eq "win32" \
-	    || [$w cget -state] eq "normal"} {
-	focus $w
-    }
+    focus $w
     if {[$w cget -autoseparators]} {
 	$w edit separator
     }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/tk.tcl b/Master/tlpkg/tltcl/lib/tk8.6/tk.tcl
index 87e0586969e..0715489dd55 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/tk.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/tk.tcl
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.6.10
+package require -exact Tk  8.6.11
 
 # Create a ::tk namespace
 namespace eval ::tk {
@@ -400,7 +400,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<NextPara>>		<Control-Down>
 	event add <<SelectPrevPara>>	<Control-Shift-Up>
 	event add <<SelectNextPara>>	<Control-Shift-Down>
-	event add <<ToggleSelection>>	<Control-ButtonPress-1>
+	event add <<ToggleSelection>>	<Control-Button-1>
 
 	# Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is
 	# returned when the user presses <Shift-Tab>. In order for tab
@@ -449,7 +449,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<NextPara>>		<Control-Down>
 	event add <<SelectPrevPara>>	<Control-Shift-Up>
 	event add <<SelectNextPara>>	<Control-Shift-Down>
-	event add <<ToggleSelection>>	<Control-ButtonPress-1>
+	event add <<ToggleSelection>>	<Control-Button-1>
     }
     "aqua" {
 	event add <<Cut>>		<Command-Key-x> <Key-F2> <Command-Lock-Key-X>
@@ -462,8 +462,6 @@ switch -exact -- [tk windowingsystem] {
 	# Official bindings
 	# See http://support.apple.com/kb/HT1343
 	event add <<SelectAll>>		<Command-Key-a>
-	#Attach function keys not otherwise assigned to this event so they no-op - workaround for bug 0e6930dfe7
-	event add <<SelectNone>>	<Option-Command-Key-a> <Key-F5> <Key-F1> <Key-F5> <Key-F6> <Key-F7> <Key-F8> <Key-F9> <Key-F10> <Key-F11> <Key-F12>
 	event add <<Undo>>		<Command-Key-z> <Command-Lock-Key-Z>
 	event add <<Redo>>		<Shift-Command-Key-z> <Shift-Command-Lock-Key-z>
 	event add <<NextChar>>		<Right> <Control-Key-f> <Control-Lock-Key-F>
@@ -488,7 +486,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<NextPara>>		<Option-Down>
 	event add <<SelectPrevPara>>	<Shift-Option-Up>
 	event add <<SelectNextPara>>	<Shift-Option-Down>
-	event add <<ToggleSelection>>	<Command-ButtonPress-1>
+	event add <<ToggleSelection>>	<Command-Button-1>
     }
 }
 
@@ -498,7 +496,7 @@ switch -exact -- [tk windowingsystem] {
 
 if {$::tk_library ne ""} {
     proc ::tk::SourceLibFile {file} {
-        namespace eval :: [list source [file join $::tk_library $file.tcl]]
+        namespace eval :: [list source -encoding utf-8 [file join $::tk_library $file.tcl]]
     }
     namespace eval ::tk {
 	SourceLibFile icons
@@ -689,9 +687,11 @@ if {[tk windowingsystem] eq "aqua"} {
 if {[tk windowingsystem] eq "aqua"} {
     #stub procedures to respond to "do script" Apple Events
     proc ::tk::mac::DoScriptFile {file} {
-    	source $file
+	uplevel #0 $file
+    	source -encoding utf-8 $file
     }
     proc ::tk::mac::DoScriptText {script} {
+	uplevel #0 $script
     	eval $script
     }
 }
@@ -703,7 +703,7 @@ set ::tk::Priv(IMETextMark) [dict create]
 
 # Run the Ttk themed widget set initialization
 if {$::ttk::library ne ""} {
-    uplevel \#0 [list source $::ttk::library/ttk.tcl]
+    uplevel \#0 [list source -encoding utf-8 $::ttk::library/ttk.tcl]
 }
 
 # Local Variables:
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/tkAppInit.c b/Master/tlpkg/tltcl/lib/tk8.6/tkAppInit.c
index 13bcdde2eb6..6cf3d42b3ee 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/tkAppInit.c
+++ b/Master/tlpkg/tltcl/lib/tk8.6/tkAppInit.c
@@ -15,9 +15,16 @@
 #undef BUILD_tk
 #undef STATIC_BUILD
 #include "tk.h"
+#include "tkPort.h"
 
 #ifdef TK_TEST
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern Tcl_PackageInitProc Tktest_Init;
+#ifdef __cplusplus
+}
+#endif
 #endif /* TK_TEST */
 
 /*
@@ -30,7 +37,11 @@ extern Tcl_PackageInitProc Tktest_Init;
 #define TK_LOCAL_APPINIT Tcl_AppInit
 #endif
 #ifndef MODULE_SCOPE
-#   define MODULE_SCOPE extern
+#   ifdef __cplusplus
+#	define MODULE_SCOPE extern "C"
+#   else
+#	define MODULE_SCOPE extern
+#   endif
 #endif
 MODULE_SCOPE int TK_LOCAL_APPINIT(Tcl_Interp *);
 MODULE_SCOPE int main(int, char **);
@@ -111,6 +122,13 @@ Tcl_AppInit(
     }
     Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
 
+#if defined(USE_CUSTOM_EXIT_PROC)
+    if (TkpWantsExitProc()) {
+	/* The cast below avoids warnings from old gcc compilers. */
+	Tcl_SetExitProc((void *)TkpExitProc);
+    }
+#endif
+
 #ifdef TK_TEST
     if (Tktest_Init(interp) == TCL_ERROR) {
 	return TCL_ERROR;
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/aquaTheme.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/aquaTheme.tcl
index e8009bed348..3ccdd70d79f 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/aquaTheme.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/aquaTheme.tcl
@@ -15,7 +15,7 @@ namespace eval ttk::theme::aqua {
 	    -insertwidth 1
 
 	ttk::style map . \
-	    -foreground { 
+	    -foreground {
 		disabled systemDisabledControlTextColor
 		background systemLabelColor} \
 	    -selectbackground {
@@ -35,21 +35,38 @@ namespace eval ttk::theme::aqua {
 	ttk::style configure TMenubutton -anchor center -padding {2 0 0 2}
 	ttk::style configure Toolbutton -anchor center
 
+	# For Entry, Combobox and Spinbox widgets the selected text background
+	# is the "Highlight color" selected in preferences when the widget
+	# has focus.  It is a gray color when the widget does not have focus or
+	# the window does not have focus. (The background state implies !focus
+	# so we only need to specify !focus.)
+
 	# Entry
-	ttk::style configure TEntry \
-	    -foreground systemTextColor \
-	    -background systemTextBackgroundColor
 	ttk::style map TEntry \
 	    -foreground {
 		disabled systemDisabledControlTextColor
 	    } \
-	    -selectforeground {
-		background systemTextColor
+	    -selectbackground {
+		!focus systemUnemphasizedSelectedTextBackgroundColor
+	    }
+
+	# Combobox:
+	ttk::style map TCombobox \
+	    -foreground {
+		disabled systemDisabledControlTextColor
 	    } \
 	    -selectbackground {
-		background systemTextBackgroundColor
+		!focus systemUnemphasizedSelectedTextBackgroundColor
+	    }
+
+	# Spinbox
+	ttk::style map TSpinbox \
+	    -foreground {
+		disabled systemDisabledControlTextColor
+	    } \
+	    -selectbackground {
+		!focus systemUnemphasizedSelectedTextBackgroundColor
 	    }
-	    
 
 	# Workaround for #1100117:
 	# Actually, on Aqua we probably shouldn't stipple images in
@@ -67,40 +84,6 @@ namespace eval ttk::theme::aqua {
 		disabled systemDisabledControlTextColor
 		selected systemSelectedTabTextColor}
 
-	# Combobox:
-	ttk::style configure TCombobox \
-	    -foreground systemTextColor \
-	    -background systemTransparent
-	ttk::style map TCombobox \
-	    -foreground {
-		disabled systemDisabledControlTextColor
-	    } \
-	    -selectforeground {
-		background systemTextColor
-	    } \
-	    -selectbackground {
-		background systemTransparent
-	    }
-
-	# Spinbox
-	ttk::style configure TSpinbox \
-	    -foreground systemTextColor \
-	    -background systemTextBackgroundColor \
-	    -selectforeground systemSelectedTextColor \
-	    -selectbackground systemSelectedTextBackgroundColor
-	ttk::style map TSpinbox \
-	    -foreground {
-		disabled systemDisabledControlTextColor
-	    } \
-	    -selectforeground {
-		!active systemTextColor
-	    } \
-	    -selectbackground {
-		!active systemTextBackgroundColor
-		!focus systemTextBackgroundColor
-		focus systemSelectedTextBackgroundColor
-	    }
-	
 	# Treeview:
 	ttk::style configure Heading \
 	    -font TkHeadingFont \
@@ -116,7 +99,7 @@ namespace eval ttk::theme::aqua {
 	    }
 
 	# Enable animation for ttk::progressbar widget:
-	ttk::style configure TProgressbar -period 100 -maxphase 255
+	ttk::style configure TProgressbar -period 100 -maxphase 120
 
 	# For Aqua, labelframe labels should appear outside the border,
 	# with a 14 pixel inset and 4 pixels spacing between border and label
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/button.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/button.tcl
index 9f2cec729d8..e8c24a198fa 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/button.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/button.tcl
@@ -8,8 +8,8 @@
 # (If the button is released off the widget, the grab deactivates and
 # we get a <Leave> event then, which turns off the "active" state)
 #
-# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are 
-# delivered to the widget which received the initial <ButtonPress>
+# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are
+# delivered to the widget which received the initial <Button>
 # event.  However, Tk [grab]s (#1223103) and menu interactions
 # (#1222605) can interfere with this.  To guard against spurious
 # <Button1-Enter> events, the <Button1-Enter> binding only sets
@@ -20,10 +20,10 @@ namespace eval ttk::button {}
 
 bind TButton <Enter> 		{ %W instate !disabled {%W state active} }
 bind TButton <Leave>		{ %W state !active }
-bind TButton <Key-space>	{ ttk::button::activate %W }
+bind TButton <space>		{ ttk::button::activate %W }
 bind TButton <<Invoke>> 	{ ttk::button::activate %W }
 
-bind TButton <ButtonPress-1> \
+bind TButton <Button-1> \
     { %W instate !disabled { ttk::clickToFocus %W; %W state pressed } }
 bind TButton <ButtonRelease-1> \
     { %W instate pressed { %W state !pressed; %W instate !disabled { %W invoke } } }
@@ -39,11 +39,11 @@ ttk::copyBindings TButton TRadiobutton
 
 # ...plus a few more:
 
-bind TRadiobutton <KeyPress-Up> 	{ ttk::button::RadioTraverse %W -1 }
-bind TRadiobutton <KeyPress-Down> 	{ ttk::button::RadioTraverse %W +1 }
+bind TRadiobutton <Up>  		{ ttk::button::RadioTraverse %W -1 }
+bind TRadiobutton <Down> 		{ ttk::button::RadioTraverse %W +1 }
 
-# bind TCheckbutton <KeyPress-plus> { %W select }
-# bind TCheckbutton <KeyPress-minus> { %W deselect }
+# bind TCheckbutton <plus> { %W select }
+# bind TCheckbutton <minus> { %W deselect }
 
 # activate --
 #	Simulate a button press: temporarily set the state to 'pressed',
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/clamTheme.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/clamTheme.tcl
index 6935fc70441..bfcb1942fed 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/clamTheme.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/clamTheme.tcl
@@ -5,7 +5,7 @@
 #
 
 namespace eval ttk::theme::clam {
-    variable colors 
+    variable colors
     array set colors {
 	-disabledfg		"#999999"
 	-frame  		"#dcdad5"
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/combobox.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/combobox.tcl
index 1355a048500..e339f97a65c 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/combobox.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/combobox.tcl
@@ -45,13 +45,13 @@ namespace eval ttk::combobox {
 
 ttk::copyBindings TEntry TCombobox
 
-bind TCombobox <KeyPress-Down> 		{ ttk::combobox::Post %W }
-bind TCombobox <KeyPress-Escape> 	{ ttk::combobox::Unpost %W }
+bind TCombobox <Down> 			{ ttk::combobox::Post %W }
+bind TCombobox <Escape> 		{ ttk::combobox::Unpost %W }
 
-bind TCombobox <ButtonPress-1> 		{ ttk::combobox::Press "" %W %x %y }
-bind TCombobox <Shift-ButtonPress-1>	{ ttk::combobox::Press "s" %W %x %y }
-bind TCombobox <Double-ButtonPress-1> 	{ ttk::combobox::Press "2" %W %x %y }
-bind TCombobox <Triple-ButtonPress-1> 	{ ttk::combobox::Press "3" %W %x %y }
+bind TCombobox <Button-1> 		{ ttk::combobox::Press "" %W %x %y }
+bind TCombobox <Shift-Button-1>		{ ttk::combobox::Press "s" %W %x %y }
+bind TCombobox <Double-Button-1> 	{ ttk::combobox::Press "2" %W %x %y }
+bind TCombobox <Triple-Button-1> 	{ ttk::combobox::Press "3" %W %x %y }
 bind TCombobox <B1-Motion>		{ ttk::combobox::Drag %W %x }
 bind TCombobox <Motion>			{ ttk::combobox::Motion %W %x %y }
 
@@ -62,9 +62,9 @@ bind TCombobox <<TraverseIn>> 		{ ttk::combobox::TraverseIn %W }
 ### Combobox listbox bindings.
 #
 bind ComboboxListbox <ButtonRelease-1>	{ ttk::combobox::LBSelected %W }
-bind ComboboxListbox <KeyPress-Return>	{ ttk::combobox::LBSelected %W }
-bind ComboboxListbox <KeyPress-Escape>  { ttk::combobox::LBCancel %W }
-bind ComboboxListbox <KeyPress-Tab>	{ ttk::combobox::LBTab %W next }
+bind ComboboxListbox <Return>		{ ttk::combobox::LBSelected %W }
+bind ComboboxListbox <Escape>		{ ttk::combobox::LBCancel %W }
+bind ComboboxListbox <Tab>		{ ttk::combobox::LBTab %W next }
 bind ComboboxListbox <<PrevWindow>>	{ ttk::combobox::LBTab %W prev }
 bind ComboboxListbox <Destroy>		{ ttk::combobox::LBCleanup %W }
 bind ComboboxListbox <Motion>		{ ttk::combobox::LBHover %W %x %y }
@@ -82,7 +82,7 @@ switch -- [tk windowingsystem] {
 #
 bind ComboboxPopdown	<Map>		{ ttk::combobox::MapPopdown %W }
 bind ComboboxPopdown	<Unmap>		{ ttk::combobox::UnmapPopdown %W }
-bind ComboboxPopdown	<ButtonPress> \
+bind ComboboxPopdown	<Button> \
 			{ ttk::combobox::Unpost [winfo parent %W] }
 
 ### Option database settings.
@@ -106,7 +106,7 @@ switch -- [tk windowingsystem] {
 ### Binding procedures.
 #
 
-## Press $mode $x $y -- ButtonPress binding for comboboxes.
+## Press $mode $x $y -- Button binding for comboboxes.
 #	Either post/unpost the listbox, or perform Entry widget binding,
 #	depending on widget state and location of button press.
 #
@@ -135,7 +135,7 @@ proc ttk::combobox::Press {mode w x y} {
 }
 
 ## Drag -- B1-Motion binding for comboboxes.
-#	If the initial ButtonPress event was handled by Entry binding,
+#	If the initial Button event was handled by Entry binding,
 #	perform Entry widget drag binding; otherwise nothing.
 #
 proc ttk::combobox::Drag {w x}  {
@@ -149,12 +149,14 @@ proc ttk::combobox::Drag {w x}  {
 #	Set cursor.
 #
 proc ttk::combobox::Motion {w x y} {
+    variable State
+    ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
     if {   [$w identify $x $y] eq "textarea"
         && [$w instate {!readonly !disabled}]
     } {
 	ttk::setCursor $w text
     } else {
-	ttk::setCursor $w ""
+	ttk::setCursor $w $State(userConfCursor)
     }
 }
 
@@ -355,6 +357,9 @@ proc ttk::combobox::PlacePopdown {cb popdown} {
     set w [winfo width $cb]
     set h [winfo height $cb]
     set style [$cb cget -style]
+    if { $style eq {} } {
+      set style TCombobox
+    }
     set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
     foreach var {x y w h} delta $postoffset {
     	incr $var $delta
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl
index 75f77915000..f1f9fa16336 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/cursors.tcl
@@ -140,8 +140,30 @@ proc ttk::cursor {name} {
 
 proc ttk::setCursor {w name} {
     variable Cursors
-    if {[$w cget -cursor] ne $Cursors($name)} {
-	$w configure -cursor $Cursors($name)
+    if {[info exists Cursors($name)]} {
+        set cursorname $Cursors($name)
+    }  else {
+        set cursorname $name
+    }
+    if {[$w cget -cursor] ne $cursorname} {
+        $w configure -cursor $cursorname
+    }
+}
+
+## ttk::saveCursor $w $saveVar $excludeList --
+#       Set variable $saveVar to the -cursor value from widget $w,
+#       if either:
+#       a. $saveVar does not yet exist
+#       b. the currently user-specified cursor for $w is not in
+#          $excludeList
+
+proc ttk::saveCursor {w saveVar excludeList} {
+    upvar $saveVar sv
+    if {![info exists sv]} {
+        set sv [$w cget -cursor]
+    }
+    if {[$w cget -cursor] ni $excludeList} {
+        set sv [$w cget -cursor]
     }
 }
 
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/defaults.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/defaults.tcl
index a15d1d97f5d..2db9a37e18d 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/defaults.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/defaults.tcl
@@ -43,7 +43,7 @@ namespace eval ttk::theme::default {
 	ttk::style configure TButton \
 	    -anchor center -padding "3 3" -width -9 \
 	    -relief raised -shiftrelief 1
-	ttk::style map TButton -relief [list {!disabled pressed} sunken] 
+	ttk::style map TButton -relief [list {!disabled pressed} sunken]
 
 	ttk::style configure TCheckbutton \
 	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl
index 45e35060406..4cdb5acbfb5 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/entry.tcl
@@ -40,20 +40,20 @@ option add *TEntry.cursor [ttk::cursor text] widgetDefault
 #
 # Removed the following standard Tk bindings:
 #
-# <Control-Key-space>, <Control-Shift-Key-space>,
-# <Key-Select>,  <Shift-Key-Select>:
+# <Control-space>, <Control-Shift-space>,
+# <Select>,  <Shift-Select>:
 #	Ttk entry widget doesn't use selection anchor.
-# <Key-Insert>:
+# <Insert>:
 #	Inserts PRIMARY selection (on non-Windows platforms).
 #	This is inconsistent with typical platform bindings.
-# <Double-Shift-ButtonPress-1>, <Triple-Shift-ButtonPress-1>:
+# <Double-Shift-Button-1>, <Triple-Shift-Button-1>:
 #	These don't do the right thing to start with.
-# <Meta-Key-b>, <Meta-Key-d>, <Meta-Key-f>,
-# <Meta-Key-BackSpace>, <Meta-Key-Delete>:
+# <Meta-b>, <Meta-d>, <Meta-f>,
+# <Meta-BackSpace>, <Meta-Delete>:
 #	Judgment call.  If <Meta> happens to be assigned to the Alt key,
 #	these could conflict with application accelerators.
 #	(Plus, who has a Meta key these days?)
-# <Control-Key-t>:
+# <Control-t>:
 #	Another judgment call.  If anyone misses this, let me know
 #	and I'll put it back.
 #
@@ -68,27 +68,34 @@ bind TEntry <<Clear>> 			{ ttk::entry::Clear %W }
 ## Button1 bindings:
 #	Used for selection and navigation.
 #
-bind TEntry <ButtonPress-1> 		{ ttk::entry::Press %W %x }
-bind TEntry <Shift-ButtonPress-1>	{ ttk::entry::Shift-Press %W %x }
-bind TEntry <Double-ButtonPress-1> 	{ ttk::entry::Select %W %x word }
-bind TEntry <Triple-ButtonPress-1> 	{ ttk::entry::Select %W %x line }
+bind TEntry <Button-1> 			{ ttk::entry::Press %W %x }
+bind TEntry <Shift-Button-1>		{ ttk::entry::Shift-Press %W %x }
+bind TEntry <Double-Button-1> 		{ ttk::entry::Select %W %x word }
+bind TEntry <Triple-Button-1> 		{ ttk::entry::Select %W %x line }
 bind TEntry <B1-Motion>			{ ttk::entry::Drag %W %x }
 
-bind TEntry <B1-Leave> 		{ ttk::entry::DragOut %W %m }
-bind TEntry <B1-Enter>		{ ttk::entry::DragIn %W }
-bind TEntry <ButtonRelease-1>	{ ttk::entry::Release %W }
+bind TEntry <B1-Leave> 			{ ttk::entry::DragOut %W %m }
+bind TEntry <B1-Enter>			{ ttk::entry::DragIn %W }
+bind TEntry <ButtonRelease-1>		{ ttk::entry::Release %W }
 
 bind TEntry <<ToggleSelection>> {
     %W instate {!readonly !disabled} { %W icursor @%x ; focus %W }
 }
 
-## Button2 bindings:
+## Button2 (Button3 on Aqua) bindings:
 #	Used for scanning and primary transfer.
-#	Note: ButtonRelease-2 is mapped to <<PasteSelection>> in tk.tcl.
-#
-bind TEntry <ButtonPress-2> 		{ ttk::entry::ScanMark %W %x }
-bind TEntry <B2-Motion> 		{ ttk::entry::ScanDrag %W %x }
-bind TEntry <ButtonRelease-2>		{ ttk::entry::ScanRelease %W %x }
+#	Note: ButtonRelease-2 (ButtonRelease-3 on Aqua)
+#	is mapped to <<PasteSelection>> in tk.tcl.
+#
+if {[tk windowingsystem] ne "aqua"} {
+    bind TEntry <Button-2> 		{ ttk::entry::ScanMark %W %x }
+    bind TEntry <B2-Motion> 		{ ttk::entry::ScanDrag %W %x }
+    bind TEntry <ButtonRelease-2>	{ ttk::entry::ScanRelease %W %x }
+} else {
+    bind TEntry <Button-3> 		{ ttk::entry::ScanMark %W %x }
+    bind TEntry <B3-Motion> 		{ ttk::entry::ScanDrag %W %x }
+    bind TEntry <ButtonRelease-3>	{ ttk::entry::ScanRelease %W %x }
+}
 bind TEntry <<PasteSelection>>		{ ttk::entry::ScanRelease %W %x }
 
 ## Keyboard navigation bindings:
@@ -114,26 +121,26 @@ bind TEntry <<TraverseIn>> 	{ %W selection range 0 end; %W icursor end }
 
 ## Edit bindings:
 #
-bind TEntry <KeyPress> 			{ ttk::entry::Insert %W %A }
-bind TEntry <Key-Delete>		{ ttk::entry::Delete %W }
-bind TEntry <Key-BackSpace> 		{ ttk::entry::Backspace %W }
+bind TEntry <Key> 			{ ttk::entry::Insert %W %A }
+bind TEntry <Delete>			{ ttk::entry::Delete %W }
+bind TEntry <BackSpace> 		{ ttk::entry::Backspace %W }
 
 # Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-# Otherwise, the <KeyPress> class binding will fire and insert the character.
+# Otherwise, the <Key> class binding will fire and insert the character.
 # Ditto for Escape, Return, and Tab.
 #
-bind TEntry <Alt-KeyPress>		{# nothing}
-bind TEntry <Meta-KeyPress>		{# nothing}
-bind TEntry <Control-KeyPress> 		{# nothing}
-bind TEntry <Key-Escape> 		{# nothing}
-bind TEntry <Key-Return> 		{# nothing}
-bind TEntry <Key-KP_Enter> 		{# nothing}
-bind TEntry <Key-Tab> 			{# nothing}
+bind TEntry <Alt-Key>			{# nothing}
+bind TEntry <Meta-Key>			{# nothing}
+bind TEntry <Control-Key> 		{# nothing}
+bind TEntry <Escape> 			{# nothing}
+bind TEntry <Return> 			{# nothing}
+bind TEntry <KP_Enter> 			{# nothing}
+bind TEntry <Tab> 			{# nothing}
 
 # Argh.  Apparently on Windows, the NumLock modifier is interpreted
 # as a Command modifier.
 if {[tk windowingsystem] eq "aqua"} {
-    bind TEntry <Command-KeyPress>	{# nothing}
+    bind TEntry <Command-Key>		{# nothing}
 }
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind TEntry <<PrevLine>>		{# nothing}
@@ -141,9 +148,9 @@ bind TEntry <<NextLine>>		{# nothing}
 
 ## Additional emacs-like bindings:
 #
-bind TEntry <Control-Key-d>		{ ttk::entry::Delete %W }
-bind TEntry <Control-Key-h>		{ ttk::entry::Backspace %W }
-bind TEntry <Control-Key-k>		{ %W delete insert end }
+bind TEntry <Control-d>			{ ttk::entry::Delete %W }
+bind TEntry <Control-h>			{ ttk::entry::Backspace %W }
+bind TEntry <Control-k>			{ %W delete insert end }
 
 # Bindings for IME text input.
 
@@ -351,7 +358,7 @@ proc ttk::entry::Extend {w where} {
 # Triple-clicking enters "line-select" mode.
 #
 
-## Press -- ButtonPress-1 binding.
+## Press -- Button-1 binding.
 #	Set the insertion cursor, claim the input focus, set up for
 #	future drag operations.
 #
@@ -368,7 +375,7 @@ proc ttk::entry::Press {w x} {
     set State(anchor) [$w index insert]
 }
 
-## Shift-Press -- Shift-ButtonPress-1 binding.
+## Shift-Press -- Shift-Button-1 binding.
 #	Extends the selection, sets anchor for future drag operations.
 #
 proc ttk::entry::Shift-Press {w x} {
@@ -517,7 +524,7 @@ proc ttk::entry::LineSelect {w _ _} {
 ### Button 2 binding procedures.
 #
 
-## ScanMark -- ButtonPress-2 binding.
+## ScanMark -- Button-2 binding.
 #	Marks the start of a scan or primary transfer operation.
 #
 proc ttk::entry::ScanMark {w x} {
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/fonts.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/fonts.tcl
index a2781c69bd1..bf4ccd09ee8 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/fonts.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/fonts.tcl
@@ -82,7 +82,7 @@ switch -- [tk windowingsystem] {
                 set F(family) "MS Sans Serif"
             }
         } else {
-            if {[lsearch -exact [font families] Tahoma] != -1} {
+            if {[lsearch -exact [font families] Tahoma] >= 0} {
                 set F(family) "Tahoma"
             } else {
                 set F(family) "MS Sans Serif"
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl
index 43b3cd8ef27..a245df81ba7 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/menubutton.tcl
@@ -5,12 +5,12 @@
 #
 # Pulldown: Press menubutton, drag over menu, release to activate menu entry
 # Popdown: Click menubutton to post menu
-# Keyboard: <Key-space> or accelerator key to post menu
+# Keyboard: <space> or accelerator key to post menu
 #
 # (In addition, when menu system is active, "dropdown" -- menu posts
 # on mouse-over.  Ttk menubuttons don't implement this).
 #
-# For keyboard and popdown mode, we hand off to tk_popup and let 
+# For keyboard and popdown mode, we hand off to tk_popup and let
 # the built-in Tk bindings handle the rest of the interaction.
 #
 # ON X11:
@@ -19,16 +19,16 @@
 # This won't work for Ttk menubuttons in pulldown mode,
 # since we need to process the final <ButtonRelease> event,
 # and this might be delivered to the menu.  So instead we
-# rely on the passive grab that occurs on <ButtonPress> events,
+# rely on the passive grab that occurs on <Button> events,
 # and transition to popdown mode when the mouse is released
 # or dragged outside the menubutton.
-# 
+#
 # ON WINDOWS:
 #
-# I'm not sure what the hell is going on here.  [$menu post] apparently 
+# I'm not sure what the hell is going on here.  [$menu post] apparently
 # sets up some kind of internal grab for native menus.
 # On this platform, just use [tk_popup] for all menu actions.
-# 
+#
 # ON MACOS:
 #
 # Same probably applies here.
@@ -46,15 +46,15 @@ namespace eval ttk {
 
 bind TMenubutton <Enter>	{ %W instate !disabled {%W state active } }
 bind TMenubutton <Leave>	{ %W state !active }
-bind TMenubutton <Key-space> 	{ ttk::menubutton::Popdown %W }
+bind TMenubutton <space>	{ ttk::menubutton::Popdown %W }
 bind TMenubutton <<Invoke>> 	{ ttk::menubutton::Popdown %W }
 
 if {[tk windowingsystem] eq "x11"} {
-    bind TMenubutton <ButtonPress-1>  	{ ttk::menubutton::Pulldown %W }
+    bind TMenubutton <Button-1>  	{ ttk::menubutton::Pulldown %W }
     bind TMenubutton <ButtonRelease-1>	{ ttk::menubutton::TransferGrab %W }
     bind TMenubutton <B1-Leave> 	{ ttk::menubutton::TransferGrab %W }
 } else {
-    bind TMenubutton <ButtonPress-1>  \
+    bind TMenubutton <Button-1>  \
 	{ %W state pressed ; ttk::menubutton::Popdown %W }
     bind TMenubutton <ButtonRelease-1>  \
 	{ if {[winfo exists %W]} { %W state !pressed } }
@@ -97,7 +97,7 @@ if {[tk windowingsystem] eq "aqua"} {
 	    }
 	    below {
 		set entry ""
-		incr y $bh 
+		incr y $bh
 	    }
 	    left {
 		incr y $menuPad
@@ -105,7 +105,7 @@ if {[tk windowingsystem] eq "aqua"} {
 	    }
 	    right {
 		incr y $menuPad
-		incr x $bw 
+		incr x $bw
 	    }
 	    default {
 		incr y $bbh
@@ -182,7 +182,7 @@ proc ttk::menubutton::Popdown {mb} {
 
 # Pulldown (X11 only) --
 #	Called when Button1 is pressed on a menubutton.
-#	Posts the menu; a subsequent ButtonRelease 
+#	Posts the menu; a subsequent ButtonRelease
 #	or Leave event will set a grab on the menu.
 #
 proc ttk::menubutton::Pulldown {mb} {
@@ -224,11 +224,11 @@ proc ttk::menubutton::TransferGrab {mb} {
 # FindMenuEntry --
 #	Hack to support tk_optionMenus.
 #	Returns the index of the menu entry with a matching -label,
-#	-1 if not found.
+#	"" if not found.
 #
 proc ttk::menubutton::FindMenuEntry {menu s} {
     set last [$menu index last]
-    if {$last eq "none"} {
+    if {$last eq "none" || $last eq ""} {
 	return ""
     }
     for {set i 0} {$i <= $last} {incr i} {
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/notebook.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/notebook.tcl
index 72b85e6f161..c5340a5cdd4 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/notebook.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/notebook.tcl
@@ -6,11 +6,11 @@ namespace eval ttk::notebook {
     variable TLNotebooks ;# See enableTraversal
 }
 
-bind TNotebook <ButtonPress-1>		{ ttk::notebook::Press %W %x %y }
-bind TNotebook <Key-Right>		{ ttk::notebook::CycleTab %W  1; break }
-bind TNotebook <Key-Left>		{ ttk::notebook::CycleTab %W -1; break }
-bind TNotebook <Control-Key-Tab>	{ ttk::notebook::CycleTab %W  1; break }
-bind TNotebook <Control-Shift-Key-Tab>	{ ttk::notebook::CycleTab %W -1; break }
+bind TNotebook <Button-1>		{ ttk::notebook::Press %W %x %y }
+bind TNotebook <Right>			{ ttk::notebook::CycleTab %W  1; break }
+bind TNotebook <Left>			{ ttk::notebook::CycleTab %W -1; break }
+bind TNotebook <Control-Tab>		{ ttk::notebook::CycleTab %W  1; break }
+bind TNotebook <Control-Shift-Tab>	{ ttk::notebook::CycleTab %W -1; break }
 catch {
 bind TNotebook <Control-ISO_Left_Tab>	{ ttk::notebook::CycleTab %W -1; break }
 }
@@ -43,7 +43,7 @@ proc ttk::notebook::ActivateTab {w tab} {
 }
 
 # Press $nb $x $y --
-#	ButtonPress-1 binding for notebook widgets.
+#	Button-1 binding for notebook widgets.
 #	Activate the tab under the mouse cursor, if any.
 #
 proc ttk::notebook::Press {w x y} {
@@ -70,7 +70,7 @@ proc ttk::notebook::CycleTab {w dir} {
 }
 
 # MnemonicTab $nb $key --
-#	Scan all tabs in the specified notebook for one with the 
+#	Scan all tabs in the specified notebook for one with the
 #	specified mnemonic. If found, returns path name of tab;
 #	otherwise returns ""
 #
@@ -94,8 +94,8 @@ proc ttk::notebook::MnemonicTab {nb key} {
 #	Enable keyboard traversal for a notebook widget
 #	by adding bindings to the containing toplevel window.
 #
-#	TLNotebooks($top) keeps track of the list of all traversal-enabled 
-#	notebooks contained in the toplevel 
+#	TLNotebooks($top) keeps track of the list of all traversal-enabled
+#	notebooks contained in the toplevel
 #
 proc ttk::notebook::enableTraversal {nb} {
     variable TLNotebooks
@@ -105,18 +105,18 @@ proc ttk::notebook::enableTraversal {nb} {
     if {![info exists TLNotebooks($top)]} {
 	# Augment $top bindings:
 	#
-	bind $top <Control-Key-Next>         {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Control-Key-Prior>        {+ttk::notebook::TLCycleTab %W -1}
-	bind $top <Control-Key-Tab> 	     {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Control-Shift-Key-Tab>    {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-Next>             {+ttk::notebook::TLCycleTab %W  1}
+	bind $top <Control-Prior>            {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-Tab> 	     {+ttk::notebook::TLCycleTab %W  1}
+	bind $top <Control-Shift-Tab>        {+ttk::notebook::TLCycleTab %W -1}
 	catch {
-	bind $top <Control-Key-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-ISO_Left_Tab>     {+ttk::notebook::TLCycleTab %W -1}
 	}
 	if {[tk windowingsystem] eq "aqua"} {
-	    bind $top <Option-KeyPress> \
+	    bind $top <Option-Key> \
 		+[list ttk::notebook::MnemonicActivation $top %K]
 	} else {
-	    bind $top <Alt-KeyPress> \
+	    bind $top <Alt-Key> \
 		+[list ttk::notebook::MnemonicActivation $top %K]
 	}
 	bind $top <Destroy> {+ttk::notebook::TLCleanup %W}
@@ -145,7 +145,7 @@ proc ttk::notebook::Cleanup {nb} {
     }
 }
 
-# EnclosingNotebook $w -- 
+# EnclosingNotebook $w --
 #	Return the nearest traversal-enabled notebook widget
 #	that contains $w.
 #
@@ -171,7 +171,7 @@ proc ttk::notebook::EnclosingNotebook {w} {
 
 # TLCycleTab --
 #	toplevel binding procedure for Control-Tab / Control-Shift-Tab
-#	Select the next/previous tab in the nearest ancestor notebook. 
+#	Select the next/previous tab in the nearest ancestor notebook.
 #
 proc ttk::notebook::TLCycleTab {w dir} {
     set nb [EnclosingNotebook $w]
@@ -182,7 +182,7 @@ proc ttk::notebook::TLCycleTab {w dir} {
 }
 
 # MnemonicActivation $nb $key --
-#	Alt-KeyPress binding procedure for mnemonic activation.
+#	Alt-Key binding procedure for mnemonic activation.
 #	Scan all notebooks in specified toplevel for a tab with the
 #	the specified mnemonic.  If found, activate it and return TCL_BREAK.
 #
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl
index a2e073b44dc..0fd9bd75631 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/panedwindow.tcl
@@ -15,7 +15,7 @@ namespace eval ttk::panedwindow {
 
 ## Bindings:
 #
-bind TPanedwindow <ButtonPress-1> 	{ ttk::panedwindow::Press %W %x %y }
+bind TPanedwindow <Button-1> 		{ ttk::panedwindow::Press %W %x %y }
 bind TPanedwindow <B1-Motion>		{ ttk::panedwindow::Drag %W %x %y }
 bind TPanedwindow <ButtonRelease-1> 	{ ttk::panedwindow::Release %W %x %y }
 
@@ -62,13 +62,22 @@ proc ttk::panedwindow::Release {w x y} {
 #
 proc ttk::panedwindow::ResetCursor {w} {
     variable State
+
+    ttk::saveCursor $w State(userConfCursor) \
+            [list [ttk::cursor hresize] [ttk::cursor vresize]]
+
     if {!$State(pressed)} {
-	ttk::setCursor $w {}
+	ttk::setCursor $w $State(userConfCursor)
     }
 }
 
 proc ttk::panedwindow::SetCursor {w x y} {
-    set cursor ""
+    variable State
+
+    ttk::saveCursor $w State(userConfCursor) \
+            [list [ttk::cursor hresize] [ttk::cursor vresize]]
+
+    set cursor $State(userConfCursor)
     if {[llength [$w identify $x $y]]} {
     	# Assume we're over a sash.
 	switch -- [$w cget -orient] {
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/scale.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/scale.tcl
index 62c85bf4c3a..61c4136141d 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/scale.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/scale.tcl
@@ -9,15 +9,15 @@ namespace eval ttk::scale {
     }
 }
 
-bind TScale <ButtonPress-1>   { ttk::scale::Press %W %x %y }
+bind TScale <Button-1>        { ttk::scale::Press %W %x %y }
 bind TScale <B1-Motion>       { ttk::scale::Drag %W %x %y }
 bind TScale <ButtonRelease-1> { ttk::scale::Release %W %x %y }
 
-bind TScale <ButtonPress-2>   { ttk::scale::Jump %W %x %y }
+bind TScale <Button-2>        { ttk::scale::Jump %W %x %y }
 bind TScale <B2-Motion>       { ttk::scale::Drag %W %x %y }
 bind TScale <ButtonRelease-2> { ttk::scale::Release %W %x %y }
 
-bind TScale <ButtonPress-3>   { ttk::scale::Jump %W %x %y }
+bind TScale <Button-3>        { ttk::scale::Jump %W %x %y }
 bind TScale <B3-Motion>       { ttk::scale::Drag %W %x %y }
 bind TScale <ButtonRelease-3> { ttk::scale::Release %W %x %y }
 
@@ -52,7 +52,7 @@ proc ttk::scale::Press {w x y} {
     }
 }
 
-# scale::Jump -- ButtonPress-2/3 binding for scale acts like
+# scale::Jump -- Button-2/3 binding for scale acts like
 #	Press except that clicking in the trough jumps to the
 #	clicked position.
 proc ttk::scale::Jump {w x y} {
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/scrollbar.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/scrollbar.tcl
index d08e1e2aba4..12134507434 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/scrollbar.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/scrollbar.tcl
@@ -9,14 +9,35 @@ namespace eval ttk::scrollbar {
     # State(first)	-- value of -first at start of drag.
 }
 
-bind TScrollbar <ButtonPress-1> 	{ ttk::scrollbar::Press %W %x %y }
+bind TScrollbar <Button-1> 		{ ttk::scrollbar::Press %W %x %y }
 bind TScrollbar <B1-Motion>		{ ttk::scrollbar::Drag %W %x %y }
 bind TScrollbar <ButtonRelease-1>	{ ttk::scrollbar::Release %W %x %y }
 
-bind TScrollbar <ButtonPress-2> 	{ ttk::scrollbar::Jump %W %x %y }
+bind TScrollbar <Button-2> 		{ ttk::scrollbar::Jump %W %x %y }
 bind TScrollbar <B2-Motion>		{ ttk::scrollbar::Drag %W %x %y }
 bind TScrollbar <ButtonRelease-2>	{ ttk::scrollbar::Release %W %x %y }
 
+# Redirect scrollwheel bindings to the scrollbar widget
+#
+# The shift-bindings scroll left/right (not up/down)
+# if a widget has both possibilities
+set eventList [list <MouseWheel> <Shift-MouseWheel>]
+switch [tk windowingsystem] {
+    aqua {
+        lappend eventList <Option-MouseWheel> <Shift-Option-MouseWheel>
+    }
+    x11 {
+        lappend eventList <Button-4> <Button-5> \
+                <Shift-Button-4> <Shift-Button-5>
+        # For tk 8.7, the event list will be extended by
+        # <Button-6> <Button-7>
+    }
+}
+foreach event $eventList {
+    bind TScrollbar $event [bind Scrollbar $event]
+}
+unset eventList event
+
 proc ttk::scrollbar::Scroll {w n units} {
     set cmd [$w cget -command]
     if {$cmd ne ""} {
@@ -38,7 +59,7 @@ proc ttk::scrollbar::Press {w x y} {
     set State(yPress) $y
 
     switch -glob -- [$w identify $x $y] {
-    	*uparrow -
+	*uparrow -
 	*leftarrow {
 	    ttk::Repeatedly Scroll $w -1 units
 	}
@@ -46,6 +67,7 @@ proc ttk::scrollbar::Press {w x y} {
 	*rightarrow {
 	    ttk::Repeatedly Scroll $w  1 units
 	}
+	*grip -
 	*thumb {
 	    set State(first) [lindex [$w get] 0]
 	}
@@ -68,7 +90,7 @@ proc ttk::scrollbar::Press {w x y} {
 proc ttk::scrollbar::Drag {w x y} {
     variable State
     if {![info exists State(first)]} {
-    	# Initial buttonpress was not on the thumb, 
+    	# Initial buttonpress was not on the thumb,
 	# or something screwy has happened.  In either case, ignore:
 	return;
     }
@@ -83,7 +105,7 @@ proc ttk::scrollbar::Release {w x y} {
     ttk::CancelRepeat
 }
 
-# scrollbar::Jump -- ButtonPress-2 binding for scrollbars.
+# scrollbar::Jump -- Button-2 binding for scrollbars.
 # 	Behaves exactly like scrollbar::Press, except that
 #	clicking in the trough jumps to the the selected position.
 #
@@ -91,6 +113,7 @@ proc ttk::scrollbar::Jump {w x y} {
     variable State
 
     switch -glob -- [$w identify $x $y] {
+	*grip -
 	*thumb -
 	*trough {
 	    set State(first) [$w fraction $x $y]
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/sizegrip.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/sizegrip.tcl
index 24a67c62865..080ab2d22de 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/sizegrip.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/sizegrip.tcl
@@ -32,7 +32,7 @@ namespace eval ttk::sizegrip {
     }
 }
 
-bind TSizegrip <ButtonPress-1> 		{ ttk::sizegrip::Press	%W %X %Y }
+bind TSizegrip <Button-1> 		{ ttk::sizegrip::Press	%W %X %Y }
 bind TSizegrip <B1-Motion> 		{ ttk::sizegrip::Drag 	%W %X %Y }
 bind TSizegrip <ButtonRelease-1> 	{ ttk::sizegrip::Release %W %X %Y }
 
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/spinbox.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/spinbox.tcl
index 90a1572a3a4..8aba5e13045 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/spinbox.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/spinbox.tcl
@@ -12,13 +12,13 @@ namespace eval ttk::spinbox { }
 ttk::copyBindings TEntry TSpinbox
 
 bind TSpinbox <Motion>			{ ttk::spinbox::Motion %W %x %y }
-bind TSpinbox <ButtonPress-1> 		{ ttk::spinbox::Press %W %x %y }
+bind TSpinbox <Button-1> 		{ ttk::spinbox::Press %W %x %y }
 bind TSpinbox <ButtonRelease-1> 	{ ttk::spinbox::Release %W }
 bind TSpinbox <Double-Button-1> 	{ ttk::spinbox::DoubleClick %W %x %y }
 bind TSpinbox <Triple-Button-1> 	{} ;# disable TEntry triple-click
 
-bind TSpinbox <KeyPress-Up>		{ event generate %W <<Increment>> }
-bind TSpinbox <KeyPress-Down> 		{ event generate %W <<Decrement>> }
+bind TSpinbox <Up>			{ event generate %W <<Increment>> }
+bind TSpinbox <Down> 			{ event generate %W <<Decrement>> }
 
 bind TSpinbox <<Increment>>		{ ttk::spinbox::Spin %W +1 }
 bind TSpinbox <<Decrement>> 		{ ttk::spinbox::Spin %W -1 }
@@ -29,12 +29,14 @@ ttk::bindMouseWheel TSpinbox 		[list ttk::spinbox::MouseWheel %W]
 #	Sets cursor.
 #
 proc ttk::spinbox::Motion {w x y} {
+    variable State
+    ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
     if {   [$w identify $x $y] eq "textarea"
-        && [$w instate {!readonly !disabled}]
+	&& [$w instate {!readonly !disabled}]
     } {
 	ttk::setCursor $w text
     } else {
-	ttk::setCursor $w ""
+	ttk::setCursor $w $State(userConfCursor)
     }
 }
 
@@ -44,16 +46,16 @@ proc ttk::spinbox::Press {w x y} {
     if {[$w instate disabled]} { return }
     focus $w
     switch -glob -- [$w identify $x $y] {
-        *textarea	{ ttk::entry::Press $w $x }
+	*textarea	{ ttk::entry::Press $w $x }
 	*rightarrow	-
-        *uparrow 	{ ttk::Repeatedly event generate $w <<Increment>> }
+	*uparrow 	{ ttk::Repeatedly event generate $w <<Increment>> }
 	*leftarrow	-
-        *downarrow	{ ttk::Repeatedly event generate $w <<Decrement>> }
+	*downarrow	{ ttk::Repeatedly event generate $w <<Decrement>> }
 	*spinbutton {
 	    if {$y * 2 >= [winfo height $w]} {
-	    	set event <<Decrement>>
+		set event <<Decrement>>
 	    } else {
-	    	set event <<Increment>>
+		set event <<Increment>>
 	    }
 	    ttk::Repeatedly event generate $w $event
 	}
@@ -67,7 +69,7 @@ proc ttk::spinbox::DoubleClick {w x y} {
     if {[$w instate disabled]} { return }
 
     switch -glob -- [$w identify $x $y] {
-        *textarea	{ SelectAll $w }
+	*textarea	{ SelectAll $w }
 	*		{ Press $w $x $y }
     }
 }
@@ -133,16 +135,31 @@ proc ttk::spinbox::Adjust {w v min max} {
 #	-from, -to, and -increment.
 #
 proc ttk::spinbox::Spin {w dir} {
+    variable State
+
     if {[$w instate disabled]} { return }
-    set nvalues [llength [set values [$w cget -values]]]
-    set value [$w get]
-    if {$nvalues} {
-	set current [lsearch -exact $values $value]
-	set index [Adjust $w [expr {$current + $dir}] 0 [expr {$nvalues - 1}]]
-	$w set [lindex $values $index]
+
+    if {![info exists State($w,values.length)]} {
+	set State($w,values.index) -1
+	set State($w,values.last) {}
+    }
+    set State($w,values) [$w cget -values]
+    set State($w,values.length) [llength $State($w,values)]
+
+    if {$State($w,values.length) > 0} {
+	set value [$w get]
+	set current $State($w,values.index)
+	if {$value ne $State($w,values.last)} {
+	    set current [lsearch -exact $State($w,values) $value]
+	    if {$current < 0} {set current -1}
+	}
+	set State($w,values.index) [Adjust $w [expr {$current + $dir}] 0 \
+		[expr {$State($w,values.length) - 1}]]
+	set State($w,values.last) [lindex $State($w,values) $State($w,values.index)]
+	$w set $State($w,values.last)
     } else {
-        if {[catch {
-    	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
+	if {[catch {
+	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
 	}]} {
 	    set v [$w cget -from]
 	}
@@ -160,7 +177,7 @@ proc ttk::spinbox::FormatValue {w val} {
     if {$fmt eq ""} {
 	# Try to guess a suitable -format based on -increment.
 	set delta [expr {abs([$w cget -increment])}]
-        if {0 < $delta && $delta < 1} {
+	if {0 < $delta && $delta < 1} {
 	    # NB: This guesses wrong if -increment has more than 1
 	    # significant digit itself, e.g., -increment 0.25
 	    set nsd [expr {int(ceil(-log10($delta)))}]
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/treeview.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/treeview.tcl
index df188b72917..62fc630b175 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/treeview.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/treeview.tcl
@@ -28,25 +28,25 @@ namespace eval ttk::treeview {
 bind Treeview	<Motion> 		{ ttk::treeview::Motion %W %x %y }
 bind Treeview	<B1-Leave>		{ #nothing }
 bind Treeview	<Leave>			{ ttk::treeview::ActivateHeading {} {}}
-bind Treeview	<ButtonPress-1> 	{ ttk::treeview::Press %W %x %y }
-bind Treeview	<Double-ButtonPress-1> 	{ ttk::treeview::DoubleClick %W %x %y }
+bind Treeview	<Button-1> 		{ ttk::treeview::Press %W %x %y }
+bind Treeview	<Double-Button-1> 	{ ttk::treeview::DoubleClick %W %x %y }
 bind Treeview	<ButtonRelease-1> 	{ ttk::treeview::Release %W %x %y }
 bind Treeview	<B1-Motion> 		{ ttk::treeview::Drag %W %x %y }
-bind Treeview 	<KeyPress-Up>    	{ ttk::treeview::Keynav %W up }
-bind Treeview 	<KeyPress-Down>  	{ ttk::treeview::Keynav %W down }
-bind Treeview 	<KeyPress-Right> 	{ ttk::treeview::Keynav %W right }
-bind Treeview 	<KeyPress-Left>  	{ ttk::treeview::Keynav %W left }
-bind Treeview	<KeyPress-Prior>	{ %W yview scroll -1 pages }
-bind Treeview	<KeyPress-Next> 	{ %W yview scroll  1 pages }
-bind Treeview	<KeyPress-Return>	{ ttk::treeview::ToggleFocus %W }
-bind Treeview	<KeyPress-space>	{ ttk::treeview::ToggleFocus %W }
-
-bind Treeview	<Shift-ButtonPress-1> \
+bind Treeview 	<Up>    		{ ttk::treeview::Keynav %W up }
+bind Treeview 	<Down>  		{ ttk::treeview::Keynav %W down }
+bind Treeview 	<Right> 		{ ttk::treeview::Keynav %W right }
+bind Treeview 	<Left>  		{ ttk::treeview::Keynav %W left }
+bind Treeview	<Prior>			{ %W yview scroll -1 pages }
+bind Treeview	<Next> 			{ %W yview scroll  1 pages }
+bind Treeview	<Return>		{ ttk::treeview::ToggleFocus %W }
+bind Treeview	<space>			{ ttk::treeview::ToggleFocus %W }
+
+bind Treeview	<Shift-Button-1> \
 		{ ttk::treeview::Select %W %x %y extend }
 bind Treeview	<<ToggleSelection>> \
 		{ ttk::treeview::Select %W %x %y toggle }
 
-ttk::copyBindings TtkScrollable Treeview 
+ttk::copyBindings TtkScrollable Treeview
 
 ### Binding procedures.
 #
@@ -102,7 +102,11 @@ proc ttk::treeview::Keynav {w dir} {
 #	Sets cursor, active element ...
 #
 proc ttk::treeview::Motion {w x y} {
-    set cursor {}
+    variable State
+
+    ttk::saveCursor $w State(userConfCursor) [ttk::cursor hresize]
+
+    set cursor $State(userConfCursor)
     set activeHeading {}
 
     switch -- [$w identify region $x $y] {
@@ -127,7 +131,7 @@ proc ttk::treeview::ActivateHeading {w heading} {
 	    # triggers a <Leave> event. A proc checking if the display column
 	    # $State(activeHeading) is really still present or not could be
 	    # written but it would need to check several special cases:
-	    #   a. -displaycolumns "#all" or being an explicit columns list 
+	    #   a. -displaycolumns "#all" or being an explicit columns list
 	    #   b. column #0 display is not governed by the -displaycolumn
 	    #      list but by the value of the -show option
 	    # --> Let's rather catch the following line.
@@ -151,7 +155,7 @@ proc ttk::treeview::Select {w x y op} {
     }
 }
 
-## DoubleClick -- Double-ButtonPress-1 binding.
+## DoubleClick -- Double-Button-1 binding.
 #
 proc ttk::treeview::DoubleClick {w x y} {
     if {[set row [$w identify row $x $y]] ne ""} {
@@ -161,7 +165,7 @@ proc ttk::treeview::DoubleClick {w x y} {
     }
 }
 
-## Press -- ButtonPress binding.
+## Press -- Button binding.
 #
 proc ttk::treeview::Press {w x y} {
     focus $w
@@ -261,9 +265,9 @@ proc ttk::treeview::SelectOp {w item op} {
 
 ## -selectmode none:
 #
-proc ttk::treeview::select.choose.none {w item} { $w focus $item }
-proc ttk::treeview::select.toggle.none {w item} { $w focus $item }
-proc ttk::treeview::select.extend.none {w item} { $w focus $item }
+proc ttk::treeview::select.choose.none {w item} { $w focus $item; $w see $item }
+proc ttk::treeview::select.toggle.none {w item} { $w focus $item; $w see $item }
+proc ttk::treeview::select.extend.none {w item} { $w focus $item; $w see $item }
 
 ## -selectmode browse:
 #
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/ttk.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/ttk.tcl
index 7bae211d205..73ee3d9d97e 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/ttk.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/ttk.tcl
@@ -12,9 +12,9 @@ namespace eval ::ttk {
     }
 }
 
-source [file join $::ttk::library fonts.tcl]
-source [file join $::ttk::library cursors.tcl]
-source [file join $::ttk::library utils.tcl]
+source -encoding utf-8 [file join $::ttk::library fonts.tcl]
+source -encoding utf-8 [file join $::ttk::library cursors.tcl]
+source -encoding utf-8 [file join $::ttk::library utils.tcl]
 
 ## ttk::deprecated $old $new --
 #	Define $old command as a deprecated alias for $new command
@@ -97,18 +97,18 @@ proc ::ttk::setTheme {theme} {
 
 ### Load widget bindings.
 #
-source [file join $::ttk::library button.tcl]
-source [file join $::ttk::library menubutton.tcl]
-source [file join $::ttk::library scrollbar.tcl]
-source [file join $::ttk::library scale.tcl]
-source [file join $::ttk::library progress.tcl]
-source [file join $::ttk::library notebook.tcl]
-source [file join $::ttk::library panedwindow.tcl]
-source [file join $::ttk::library entry.tcl]
-source [file join $::ttk::library combobox.tcl]	;# dependency: entry.tcl
-source [file join $::ttk::library spinbox.tcl]  ;# dependency: entry.tcl
-source [file join $::ttk::library treeview.tcl]
-source [file join $::ttk::library sizegrip.tcl]
+source -encoding utf-8 [file join $::ttk::library button.tcl]
+source -encoding utf-8 [file join $::ttk::library menubutton.tcl]
+source -encoding utf-8 [file join $::ttk::library scrollbar.tcl]
+source -encoding utf-8 [file join $::ttk::library scale.tcl]
+source -encoding utf-8 [file join $::ttk::library progress.tcl]
+source -encoding utf-8 [file join $::ttk::library notebook.tcl]
+source -encoding utf-8 [file join $::ttk::library panedwindow.tcl]
+source -encoding utf-8 [file join $::ttk::library entry.tcl]
+source -encoding utf-8 [file join $::ttk::library combobox.tcl]	;# dependency: entry.tcl
+source -encoding utf-8 [file join $::ttk::library spinbox.tcl]  ;# dependency: entry.tcl
+source -encoding utf-8 [file join $::ttk::library treeview.tcl]
+source -encoding utf-8 [file join $::ttk::library sizegrip.tcl]
 
 ## Label and Labelframe bindings:
 #  (not enough to justify their own file...)
@@ -122,7 +122,7 @@ proc ttk::LoadThemes {} {
     variable library
 
     # "default" always present:
-    uplevel #0 [list source [file join $library defaults.tcl]] 
+    uplevel #0 [list source -encoding utf-8 [file join $library defaults.tcl]]
 
     set builtinThemes [style theme names]
     foreach {theme scripts} {
@@ -135,7 +135,7 @@ proc ttk::LoadThemes {} {
     } {
 	if {[lsearch -exact $builtinThemes $theme] >= 0} {
             foreach script $scripts {
-                uplevel #0 [list source [file join $library $script]]
+                uplevel #0 [list source -encoding utf-8 [file join $library $script]]
             }
 	}
     }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl
index 857f4cde97d..f6a6c9eac8e 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/utils.tcl
@@ -58,7 +58,7 @@ proc ttk::traverseTo {w} {
 }
 
 ## ttk::clickToFocus $w --
-#	Utility routine, used in <ButtonPress-1> bindings --
+#	Utility routine, used in <Button-1> bindings --
 #	Assign keyboard focus to the specified widget if -takefocus is enabled.
 #
 proc ttk::clickToFocus {w} {
@@ -278,9 +278,6 @@ proc ttk::copyBindings {from to} {
 # On OSX, Tk generates sensible values for the %D field in <MouseWheel> events.
 #
 # On Windows, %D must be scaled by a factor of 120.
-# In addition, Tk redirects mousewheel events to the window with
-# keyboard focus instead of sending them to the window under the pointer.
-# We do not attempt to fix that here, see also TIP#171.
 #
 # OSX conventionally uses Shift+MouseWheel for horizontal scrolling,
 # and Option+MouseWheel for accelerated scrolling.
@@ -301,14 +298,14 @@ proc ttk::copyBindings {from to} {
 
 proc ttk::bindMouseWheel {bindtag callback} {
     if {[tk windowingsystem] eq "x11"} {
-	bind $bindtag <ButtonPress-4> "$callback -1"
-	bind $bindtag <ButtonPress-5> "$callback +1"
+	bind $bindtag <Button-4> "$callback -1"
+	bind $bindtag <Button-5> "$callback +1"
     }
     if {[tk windowingsystem] eq "aqua"} {
-	bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
-	bind $bindtag <Option-MouseWheel> [append callback { [expr {-10 *(%D)}]} ]
+	bind $bindtag <MouseWheel> "$callback \[expr {-%D}\]"
+	bind $bindtag <Option-MouseWheel> "$callback \[expr {-10*%D}\]"
     } else {
-	bind $bindtag <MouseWheel> [append callback { [expr {-(%D / 120)}]}]
+	bind $bindtag <MouseWheel> "$callback \[expr {-%D/120)}\]"
     }
 }
 
@@ -321,10 +318,10 @@ proc ttk::bindMouseWheel {bindtag callback} {
 #
 
 if {[tk windowingsystem] eq "x11"} {
-    bind TtkScrollable <ButtonPress-4>       { %W yview scroll -5 units }
-    bind TtkScrollable <ButtonPress-5>       { %W yview scroll  5 units }
-    bind TtkScrollable <Shift-ButtonPress-4> { %W xview scroll -5 units }
-    bind TtkScrollable <Shift-ButtonPress-5> { %W xview scroll  5 units }
+    bind TtkScrollable <Button-4>       { %W yview scroll -5 units }
+    bind TtkScrollable <Button-5>       { %W yview scroll  5 units }
+    bind TtkScrollable <Shift-Button-4> { %W xview scroll -5 units }
+    bind TtkScrollable <Shift-Button-5> { %W xview scroll  5 units }
 }
 if {[tk windowingsystem] eq "aqua"} {
     bind TtkScrollable <MouseWheel> \
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/vistaTheme.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/vistaTheme.tcl
index 094288ccc6f..07003537f48 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/vistaTheme.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/vistaTheme.tcl
@@ -3,7 +3,7 @@
 #
 
 # The Vista theme can only be defined on Windows Vista and above. The theme
-# is created in C due to the need to assign a theme-enabled function for 
+# is created in C due to the need to assign a theme-enabled function for
 # detecting when themeing is disabled. On systems that cannot support the
 # Vista theme, there will be no such theme created and we must not
 # evaluate this script.
@@ -69,9 +69,9 @@ namespace eval ttk::theme::vista {
         ttk::style layout TCombobox {
             Combobox.border -sticky nswe -border 0 -children {
                 Combobox.rightdownarrow -side right -sticky ns
-                Combobox.padding -expand 1 -sticky nswe -children {
+                Combobox.padding -sticky nswe -children {
                     Combobox.background -sticky nswe -children {
-                        Combobox.focus -expand 1 -sticky nswe -children {
+                        Combobox.focus -sticky nswe -children {
                             Combobox.textarea -sticky nswe
                         }
                     }
@@ -138,7 +138,7 @@ namespace eval ttk::theme::vista {
                 Spinbox.background -sticky news -children {
                     Spinbox.padding -sticky news -children {
                         Spinbox.innerbg -sticky news -children {
-                            Spinbox.textarea -expand 1
+                            Spinbox.textarea
                         }
                     }
                     Spinbox.uparrow -side top -sticky ens
@@ -151,7 +151,7 @@ namespace eval ttk::theme::vista {
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
 
-        
+
         # SCROLLBAR elements (Vista includes a state for 'hover')
         ttk::style element create Vertical.Scrollbar.uparrow vsapi \
             SCROLLBAR 1 {disabled 4 pressed 3 active 2 hover 17 {} 1} \
@@ -196,14 +196,14 @@ namespace eval ttk::theme::vista {
                 Vertical.Progressbar.pbar -side bottom -sticky we
             }
         }
-        
+
         # Scale
         ttk::style element create Horizontal.Scale.slider vsapi \
             TRACKBAR 3 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
             -width 6 -height 12
         ttk::style layout Horizontal.TScale {
-            Scale.focus -expand 1 -sticky nswe -children {
-                Horizontal.Scale.trough -expand 1 -sticky nswe -children {
+            Scale.focus -sticky nswe -children {
+                Horizontal.Scale.trough -sticky nswe -children {
                     Horizontal.Scale.track -sticky we
                     Horizontal.Scale.slider -side left -sticky {}
                 }
@@ -213,17 +213,17 @@ namespace eval ttk::theme::vista {
             TRACKBAR 6 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
             -width 12 -height 6
         ttk::style layout Vertical.TScale {
-            Scale.focus -expand 1 -sticky nswe -children {
-                Vertical.Scale.trough -expand 1 -sticky nswe -children {
+            Scale.focus -sticky nswe -children {
+                Vertical.Scale.trough -sticky nswe -children {
                     Vertical.Scale.track -sticky ns
                     Vertical.Scale.slider -side top -sticky {}
                 }
             }
         }
-        
+
         # Treeview
         ttk::style configure Item -padding {4 0 0 0}
-        
+
         package provide ttk::theme::vista 1.0
     }
 }
diff --git a/Master/tlpkg/tltcl/lib/tk8.6/ttk/xpTheme.tcl b/Master/tlpkg/tltcl/lib/tk8.6/ttk/xpTheme.tcl
index 4c4f6806a42..da7b4225211 100644
--- a/Master/tlpkg/tltcl/lib/tk8.6/ttk/xpTheme.tcl
+++ b/Master/tlpkg/tltcl/lib/tk8.6/ttk/xpTheme.tcl
@@ -28,13 +28,6 @@ namespace eval ttk::theme::xpnative {
 	ttk::style map TNotebook.Tab \
 	    -expand [list selected {2 2 2 2}]
 
-	# Treeview:
-	ttk::style configure Heading -font TkHeadingFont
-	ttk::style configure Treeview -background SystemWindow
-	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
-
 	ttk::style configure TLabelframe.Label -foreground "#0046d5"
 
 	# OR: -padding {3 3 3 6}, which some apps seem to use.
diff --git a/Master/tlpkg/tltcl/lib/tkConfig.sh b/Master/tlpkg/tltcl/lib/tkConfig.sh
index fbb4137d8a0..0a5b7734621 100644
--- a/Master/tlpkg/tltcl/lib/tkConfig.sh
+++ b/Master/tlpkg/tltcl/lib/tkConfig.sh
@@ -17,10 +17,10 @@ TK_DLL_FILE="tk86.dll"
 TK_VERSION='8.6'
 TK_MAJOR_VERSION='8'
 TK_MINOR_VERSION='6'
-TK_PATCH_LEVEL='.10'
+TK_PATCH_LEVEL='.11'
 
 # -D flags for use with the C compiler.
-TK_DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DMODULE_SCOPE=extern -DHAVE_NO_SEH=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_UXTHEME_H=1 -DHAVE_VSSYM32_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1 '
+TK_DEFS='-DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -DMODULE_SCOPE=extern -DHAVE_NO_SEH=1 -DHAVE_CAST_TO_UNION=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_UXTHEME_H=1 -DHAVE_VSSYM32_H=1 -DNDEBUG=1 -DTCL_CFG_OPTIMIZED=1 '
 
 # Flag, 1: we built a shared lib, 0 we didn't
 TK_SHARED_BUILD=1
@@ -29,29 +29,29 @@ TK_SHARED_BUILD=1
 TK_DBGX=
 
 # The name of the Tk library (may be either a .a file or a shared library):
-TK_LIB_FILE='libtk86.a'
+TK_LIB_FILE='libtk86.dll.a'
 
 # Additional libraries to use when linking Tk.
 TK_LIBS='-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -lws2_32 -lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32'
 
 # Top-level directory in which Tcl's platform-independent files are
 # installed.
-TK_PREFIX='/tmp/siepo/tcltk'
+TK_PREFIX='/home/siepo/tltcl'
 
 # Top-level directory in which Tcl's platform-specific files (e.g.
 # executables) are installed.
-TK_EXEC_PREFIX='/tmp/siepo/tcltk'
+TK_EXEC_PREFIX='/home/siepo/tltcl'
 
 # -l flag to pass to the linker to pick up the Tcl library
 TK_LIB_FLAG='-ltk86'
 
 # String to pass to linker to pick up the Tk library from its
 # build directory.
-TK_BUILD_LIB_SPEC='-L/tmp/siepo/tk8.6.10/win -ltk86'
+TK_BUILD_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tk8.6.11/win -ltk86'
 
 # String to pass to linker to pick up the Tk library from its
 # installed directory.
-TK_LIB_SPEC='-L/tmp/siepo/tcltk/lib -ltk86'
+TK_LIB_SPEC='-L/home/siepo/tltcl/lib -ltk86'
 
 # Location of the top-level source directory from which Tk was built.
 # This is the directory that contains a README file as well as
@@ -59,7 +59,7 @@ TK_LIB_SPEC='-L/tmp/siepo/tcltk/lib -ltk86'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tk was
 # compiled.
-TK_SRC_DIR='/tmp/siepo/tk8.6.10'
+TK_SRC_DIR='/home/siepo/xdrive/tltcl/tk8.6.11'
 
 # Needed if you want to make a 'fat' shared library library
 # containing tk objects or link a different wish.
@@ -74,14 +74,14 @@ TK_STUB_LIB_FLAG='-ltkstub86'
 
 # String to pass to linker to pick up the Tk stub library from its
 # build directory.
-TK_BUILD_STUB_LIB_SPEC='-L/tmp/siepo/tk8.6.10/win -ltkstub86'
+TK_BUILD_STUB_LIB_SPEC='-L/home/siepo/xdrive/tltcl/tk8.6.11/win -ltkstub86'
 
 # String to pass to linker to pick up the Tk stub library from its
 # installed directory.
-TK_STUB_LIB_SPEC='-L/tmp/siepo/tcltk/lib -ltkstub86'
+TK_STUB_LIB_SPEC='-L/home/siepo/tltcl/lib -ltkstub86'
 
 # Path to the Tk stub library in the build directory.
-TK_BUILD_STUB_LIB_PATH='/tmp/siepo/tk8.6.10/win/libtkstub86.a'
+TK_BUILD_STUB_LIB_PATH='/home/siepo/xdrive/tltcl/tk8.6.11/win/libtkstub86.a'
 
 # Path to the Tk stub library in the install directory.
-TK_STUB_LIB_PATH='/tmp/siepo/tcltk/lib/libtkstub86.a'
+TK_STUB_LIB_PATH='/home/siepo/tltcl/lib/libtkstub86.a'
author	Siep Kroonenberg <siepo@cybercomm.nl>	2021-03-02 16:29:37 +0000
committer	Siep Kroonenberg <siepo@cybercomm.nl>	2021-03-02 16:29:37 +0000
commit	616f8e79872ffbec55d54a3dd50a5e7c12df531e (patch)
tree	a161afe04b7f6fe85d431035954f953ebbfafc04
parent	9f5b17da86ecb1e3dc760d0cf781062ba16460a7 (diff)