Merge updates from trunk.

FossilOrigin-Name: 348c40136c8ec20f36ccdd4c8a6d4ec2d8274328b86b25b385813e3aae31ea8b

diff --cc manifest
index 12e376017bdd7c0922bb288081191d1fd304385f,9f6f8df1e6a17e7fe3372be777905642ea0bedb7..4496d049f8ce77677b5f9ad21cd73ff2b18cf58f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sminor\sproblem\swith\sEXPLAIN\sQUERY\sPLAN\sfor\striggers.
- D 2020-04-02T19:58:31.722
 -C In\sthe\sevent\sof\sa\ssemantic\serror\sin\san\saggregate\squery,\searly-out\sthe\nresetAccumulator()\sfunction\sto\sprevent\sproblems\sdue\sto\sincomplete\sor\nincorrect\sinitialization\sof\sthe\sAggInfo\sobject.\nFix\sfor\sticket\s[af4556bb5c285c08].
 -D 2020-04-03T13:19:03.054
++C Merge\supdates\sfrom\strunk.
++D 2020-04-03T15:48:05.570
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1861,7 -1860,7 +1861,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 ae3ac297d2deee2a687ae2e9cf98aaf3e1b41196363238101a19d38092aebec6
- R 5ec3a6e097b97c43d39dad4e19b96595
 -P 684293882c302600e112cf52553c19d84fdb31663d96e5dd7f8ac17dda00a026
 -R dbb40938a904f2e39c11078dcedb87b0
++P 6e11c03f84efa93b218b07e39b6b56b1d872639f39c18498ee54d8cd8364d4f5 4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441
++R 68b79c2ca4db3a36cf8566bfbe66c1bc
  U drh
- Z 9687d6d8f7e5c9ecbb821bb029981be4
 -Z 1c021fc7d9ac6b5d0e31d06cd9bb3304
++Z 322d845bf4308647ac8f5ea383cf99aa

diff --cc manifest.uuid
index 8e012436ba7063101273f5a4ce1f7bb0ddfe5922,bd11b93e7631c76867326f64184820031eed609a..0c17c5197fc1d93e2e878ff559402a59d37fd79a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6e11c03f84efa93b218b07e39b6b56b1d872639f39c18498ee54d8cd8364d4f5
 -4a302b42c7bf5e11ddb5522ca999f74aba397d3a7eb91b1844bb02852f772441
++348c40136c8ec20f36ccdd4c8a6d4ec2d8274328b86b25b385813e3aae31ea8b