Merge updates from trunk.

FossilOrigin-Name: d7db09101878102e192ee7a81437e8f6f2e317ddf110852673a2e81d1f80ae0e

diff --cc manifest
index 046be95fb456357aed25c3c99ab1dd0579bc9e5a,2e5f6a4e1e8e6db376b151aad0cbdfffaa3cdb63..5616287d0b7b3644fe0a593e7436725990a5e34a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Optimize\sthe\s"subprog\sIS\sNULL"\sconstraint.
- D 2020-03-24T18:41:58.712
 -C Reinstate\sthe\soptimization\sthat\sconverts\s"x\sIN\s(y)"\sinto\s"x==y".
 -D 2020-03-26T00:29:50.482
++C Merge\supdates\sfrom\strunk.
++D 2020-03-26T15:28:46.653
  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 c9f3405eeac8aff171b5d76bae954f3b51b353d16286a3d2af43ef942c212abc
- R 48f17b54ce03a2f2b95d1ae2b04e26b9
 -P 029ceea612f5c7a1420939d8a772eefcc6f9550d24d57b52ae1729ea9d85fae9
 -R 3705b23e9f0d2aa8bb1acee008cd53c5
++P ca8c5f028b9f6f32639c8bc9df5dc02537e21385fcbe7e1ae600c640977ea0d5 27936e6884e77093533719c7955a17f051cfb359872e51a6d1481152e6256443
++R 3e64a9cf6d09bafc409422474d49e6cf
  U drh
- Z 2b8dc1bd4e5b101494ebc4134b3976ef
 -Z f21f043fe82b450709b51f4ab8aebfa6
++Z 7c5407f80f4f891ef89724feeeb5e566

diff --cc manifest.uuid
index 8fae101c8f469d988d9b44b59315d38a6c4e8b58,6d29acdcbb9c46a1e6b8473de5f95be652e4d8f6..1771788b9e677f42046d98b3970a494262e2a49c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ca8c5f028b9f6f32639c8bc9df5dc02537e21385fcbe7e1ae600c640977ea0d5
 -27936e6884e77093533719c7955a17f051cfb359872e51a6d1481152e6256443
++d7db09101878102e192ee7a81437e8f6f2e317ddf110852673a2e81d1f80ae0e