Tcl 8.6 support was incomplete
Merge branch 'maint'

* maint:
  Tcl 8.6 support was incomplete
Merge branch 'master' into next

* master:
  Tcl 8.6 support was incomplete