Merge latest trunk changes with this branch.

FossilOrigin-Name: d693be375380fbfca426999a77eeecb8453fa77b77f608bfe266945dee1da41d

diff --cc manifest
index adf8cee3be3b39d58b7309de96e1f7bd1e1dd1f5,6845962ad33cf0527b2891be9e750570078a5a44..659885d563dc6f08a4e2ade07fd938a588ef792d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\san\sassert()\sfailure\sin\saltertable3-22.4.
- D 2019-12-28T08:26:47.067
 -C Fix\sa\sfaulty\sassert()\sassociated\swith\squery\ssearch\slimiting\squery\splans.
 -D 2019-12-28T03:55:50.593
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2019-12-28T08:33:46.892
  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 d29edef93451cc67a5d69c1cce1b1832d9ca8fff1f600afdd51338b74d077b92
- R cba70c36e93dfffeaca2b813bf7688d4
 -P 4d0b9109f7a5312d4e136395e08b11dad64d746bc106ad44d47675e5b1dcb4ef
 -R e95563f4007b963558ff78573e278f30
 -U drh
 -Z b10e6aae64694b8f3d461ddceec41120
++P c566a91d5c4290b0a491a01e85bf8f9fbebf2910e0d478bafc2d22da7f749cae 0d743585c242ebd898b232f42937a2306752aaed0a6756705e3ef1cf7593aa97
++R 9a4f1ab6b8173f2c45a1b04ce638436e
 +U dan
- Z cffa8180beb2f61f82cbe2ab0339d09f
++Z 162aa692a1101b20f72fbada0fcb5043

diff --cc manifest.uuid
index 526574e878ebfec2645edb93c3b34d272898bd4e,27ed8f0e56ee8dee74186c771d7a6bd44357a14a..a04d40b51bc4aeb58419954f7a0e692a95f2e7c0
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c566a91d5c4290b0a491a01e85bf8f9fbebf2910e0d478bafc2d22da7f749cae
 -0d743585c242ebd898b232f42937a2306752aaed0a6756705e3ef1cf7593aa97
++d693be375380fbfca426999a77eeecb8453fa77b77f608bfe266945dee1da41d