Merge recent fixes from trunk.

FossilOrigin-Name: 5dfa33a09e608d26549e46c58a5563754688af68fa99415f9a548e91f81aca7c

diff --cc manifest
index 2f8159f11482ea41012403e515eac0d22ef27d11,c62afb8435c5281f6eb945b2a0adb0942c90a4ce..44bc3b70782edd79089c8c1ee6ca6bf5037577c7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2020-01-06T19:30:36.832
 -C Add\san\s"||\sCORRUPT_DB"\sterm\sto\san\sassert()\sstatement\sinside\sof\sbtree.
 -D 2020-01-07T13:32:15.559
++C Merge\srecent\sfixes\sfrom\strunk.
++D 2020-01-07T15:44:22.828
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1853,7 -1853,7 +1853,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 411e8ec2219bb4181aaf2209fb1e7baf5e8df8b8c8adb82a69b48cf7e8e7e7d4 69f6a7e42f42116d29514239575ee1dc381b5b673da012cb5f3e8cf17922d493
- R d8f72677643e9e459892f006697ad02d
 -P e1f12978b53683114ab0ef0e84a14dd4fabc72750b214aac19cd9da22a582a27
 -R 07b7096e26b431d07883fc9cbfc33796
++P 9c50f6c28a4cadb2c33954c066a8e94f8aaf4c31b6c0309db35efc472cb0bcaa 03c1d75ddc063469fc856114595bd12d21759fe0979ce1ba1cf52e48e6b0d4a1
++R 3f9c42e2a1153621e11e54b50f905166
  U drh
- Z a5520af845981e19be8e15387b4c77ba
 -Z a639f54f6a0a3a7af89209b4839be8ff
++Z ce4d5892a82ed81a290c1004012f18cc

diff --cc manifest.uuid
index b5a9169ffdd690d5773b4dcb8c0ba912cdcc6f79,ca4967f9f2078f0046dc794651081775cb80b3a2..ebc1418a714ee05dff8deaee365a43a2f2dd6938
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9c50f6c28a4cadb2c33954c066a8e94f8aaf4c31b6c0309db35efc472cb0bcaa
 -03c1d75ddc063469fc856114595bd12d21759fe0979ce1ba1cf52e48e6b0d4a1
++5dfa33a09e608d26549e46c58a5563754688af68fa99415f9a548e91f81aca7c