Merge from trunk.

FossilOrigin-Name: d762784a46946c5a5d565d7ef8ae243703eb38eb71d6101a7f2ed6d22eff1c53

diff --cc manifest
index 08c89acab996c41256a28764d58b61a07cb4018d,5b4e46a4c5d1448357147ef32b0147a6d8ccd8fa..461fe727fb00b50677bc4f0f5d60947818c89690
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Dial\sback\sassumptions\son\scompile\soption\sdefaults\sto\sreflect\sactual\sconditionals.
- D 2021-04-16T10:25:54.528
 -C Remove\san\sALWAYS()\sfrom\sa\sbranch\sin\ssqlite3ExprAddCollateToken()\swhich\scan\nbe\sfalse\sfollowing\san\sOOM.\ndbsqlfuzz\s9e8516bf1e786c84e520ae43141b75b7399f8618.
 -D 2021-04-16T12:33:52.638
++C Merge\sfrom\strunk.
++D 2021-04-16T15:44:32.748
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1912,7 -1912,7 +1912,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 6eb83f83d280f82bd225972f52c52922257303740a968457ff0be08d43993d59
- R 81b6477b1bd41ea5f96a630ccfc9d907
 -P 5cb40e53edcb1e54cde0e54c38a647144bc3158435df0161f95c89732de086e6
 -R ddfb443f324f92c0f7d01464d567a778
 -U drh
 -Z 4128704ba35132d25cf1033fb5faf21a
++P cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359 6af4e6d054efd8445e1010aabd584f36e70dfad0de13bd0e2f1761cad4d9a7d6
++R 9ae7ee95f5dc7f502e8a8055003e6cc7
 +U larrybr
- Z cb4d1f0cfcf57b3bffb8efd3b5ca63ec
++Z f9243a7f8ee02fb22b785827398a0ea3

diff --cc manifest.uuid
index f7982e889e1f116a9de7ef2925afe71455c2acd7,9b532950dcf61be611c1f16b5433570fad5aa11f..ae72b050685b38885b4207de44b0ae24aacbb5a8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359
 -6af4e6d054efd8445e1010aabd584f36e70dfad0de13bd0e2f1761cad4d9a7d6
++d762784a46946c5a5d565d7ef8ae243703eb38eb71d6101a7f2ed6d22eff1c53