Merge from trunk.

FossilOrigin-Name: 43894f0b5b4f000a929052bc32822d704d25d139375362fad77f8824b5aad456

diff --cc manifest
index 461fe727fb00b50677bc4f0f5d60947818c89690,ef75b064ed1908eb8b19e5c395cfb50ed2850b5e..15c70391854b3d0f1eec9f810354423204478be3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Add\sgeopoly\sto\s$::sqlite_options()\sand\suse\sit\sto\spass\smore\stests.
 -D 2021-04-16T23:43:22.674
 +C Merge\sfrom\strunk.
- D 2021-04-16T15:44:32.748
++D 2021-04-16T23:53:07.986
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1912,7 -1912,7 +1912,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P cb3127725dbb9490f9bb3a95d7fd52acd78390981ee8b7c6da35bdfb84ad0359 6af4e6d054efd8445e1010aabd584f36e70dfad0de13bd0e2f1761cad4d9a7d6
- R 9ae7ee95f5dc7f502e8a8055003e6cc7
 -P ab83a99899ceae931b43e0c4b3f8f8b83bc832f1568de5692c0d038c968f8a87
 -R a25a23255eb14ac26c02b1d56b4537bc
++P d762784a46946c5a5d565d7ef8ae243703eb38eb71d6101a7f2ed6d22eff1c53 23da5016b66f3947cc902dbe2766ea9f5a00f85312a652b536ab51d657446ab7
++Q +23da5016b66f3947cc902dbe2766ea9f5a00f85312a652b536ab51d657446ab7
++R 083e0cd2e75a733d6e513853bdd8d74c
  U larrybr
- Z f9243a7f8ee02fb22b785827398a0ea3
 -Z 0a0ab19ca8aa12c6c640b6bd1ffda819
++Z fb7a3052f7a76da1a46a8c9f66d60715

diff --cc manifest.uuid
index ae72b050685b38885b4207de44b0ae24aacbb5a8,04a4c91d73bf35dcb7ba8c8241adca8b39fcd592..bd57b26da3f8c5a1719c50fc22d82f29fb3baade
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d762784a46946c5a5d565d7ef8ae243703eb38eb71d6101a7f2ed6d22eff1c53
 -23da5016b66f3947cc902dbe2766ea9f5a00f85312a652b536ab51d657446ab7
++43894f0b5b4f000a929052bc32822d704d25d139375362fad77f8824b5aad456