Merge trunk changes into this branch.

FossilOrigin-Name: d805fc0cf1c4ef07a7bc947f75828931e3788d0e64730caab3b42ae58009a194

diff --cc manifest
index b3b5999f0c788deb663d0026bf45596ba098daec,4a0790583583ae5efddaa66a64c1fdfbd5db517c..28ffcbc2c231a9ed6d1c65a97dd091e6954b2fa1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\stweaks\sto\swapptest.tcl.\sAdd\sthe\sability\sto\srun\sthe\sextra\s(n)debug\stests\sthat\sreleasetest.tcl\sruns.
- D 2019-04-11T19:03:15.406
 -C Remove\sthe\svfslog.c\sextension\sfrom\sthe\stestfixture\starget\sin\smain.mk,\sas\nthat\sextension\shas\sno\sTCL\sbindings\sand\sis\sinaccessible.
 -D 2019-04-11T17:06:54.116
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2019-04-11T19:04:01.007
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1817,7 -1815,7 +1818,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 1956eb348170a9a873878b522f377fa7303cdb3beca41f5515b6b9da1b1f544d
- R 5ac35a0406aee95794a9fe46e0ff36c7
 -P 31eb27f438ad727b095a518bfe0f7ed37cb806fc1e6929b821eddcc6cc9de260
 -R cbbbb3778a413cc90626de66ac248a8f
 -U drh
 -Z 8fdd0117852b662c297bdeca2f73cdf8
++P ec9c4f6d8da25dcc834812c2bb24bda1017833b1c572bdbbf87f0191e1310706 d71f8bbc4efd8af935671c4e7626862d6e5a4c2e51527b9e82b2f0c94ddf6e93
++R 3c54551b10c87fc6f05051e8c995cc5e
 +U dan
- Z 9c597e1a63109035dfeab32dc661484e
++Z 90203c7d6b4495f65199b8125515f7fd

diff --cc manifest.uuid
index 7fda591aa0392ce5e16b0d50e8b9a4becb87de6c,1f597c670a00f43457b6e2296f0ae70115f7bd55..d30dc48e7892c4d1f782ee56fe50b3e2e19efc05
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ec9c4f6d8da25dcc834812c2bb24bda1017833b1c572bdbbf87f0191e1310706
 -d71f8bbc4efd8af935671c4e7626862d6e5a4c2e51527b9e82b2f0c94ddf6e93
++d805fc0cf1c4ef07a7bc947f75828931e3788d0e64730caab3b42ae58009a194