Merge enhancements from trunk.

FossilOrigin-Name: 969c25bb14fbd99ca8523abf0ae78a75a3dde539e3323d105690aef4940041eb

diff --cc manifest
index 6536ccb2469b8494aeeed6b853693eadbe9abeee,ac6aa6536a938309926c2d8cd1d088729195464a..9f6a2b2b1f9e1e8e3599560e1d71edbe2bde9f0c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\schanges\sfrom\strunk.
- D 2020-07-24T13:49:38.445
 -C If\sa\swriter\scrashes\sin\sWAL\smode\sand\sleave\sthe\sSHM\sfile\sin\san\sinconsistent\sstate,\nsubsequent\stransactions\sare\snow\sable\sto\srecover\sthe\sSHM\sfile\seven\sif\sthere\sare\nactive\sread\stransactions.
 -D 2020-07-28T17:29:13.292
++C Merge\senhancements\sfrom\strunk.
++D 2020-07-28T17:51:48.981
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1879,7 -1878,8 +1879,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 849b03d8de62251707ee0d31c9f1cd98cbd296c70c1a2c8d7c1658840a930fe4 73fecc688ab5c459245c9bb89432139a083ef378404b4dae3397a7f4e253f72a
- R 9214a1b033c89ba9393ee70f0a63232f
 -P 73fecc688ab5c459245c9bb89432139a083ef378404b4dae3397a7f4e253f72a 2a251af84ff1f5ca281aa69c5410d6ae7aa5a85ef47149909a297525e1651e9d
 -R 69a29ce092f5af857bcf59873f5056ae
 -T +closed 2a251af84ff1f5ca281aa69c5410d6ae7aa5a85ef47149909a297525e1651e9d
++P 22e8e6901a119698de831ede6d8b03c4fd6576eaa8686a97a0b8aeea7593688a ee8a108058c304f9b6b02f84f1da01a0b7a3a21992627bcc1f97d42e8d23da69
++R eadae907213e64a4a20abad95f5fd65f
  U drh
- Z d41ecf0a1092c8d49d888e26f4ee5585
 -Z f0509e0a6ac22a3eb269a4a65f129fe3
++Z c2595a223b4a7c3d570814053566ad4a

diff --cc manifest.uuid
index be11d5569e941161339b18eca8bd67a06cc9b558,f9787d86e374b12de76c39343bace1d24c745868..92cc10c689bcc273935b8cb449cd5821c425abfc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 22e8e6901a119698de831ede6d8b03c4fd6576eaa8686a97a0b8aeea7593688a
 -ee8a108058c304f9b6b02f84f1da01a0b7a3a21992627bcc1f97d42e8d23da69
++969c25bb14fbd99ca8523abf0ae78a75a3dde539e3323d105690aef4940041eb