Merge enhancements from trunk.

FossilOrigin-Name: 4945a66237fa3861bc691d5fbef0d40286b596a0902b4f4c032d1d6528bb1a1b

diff --cc manifest
index 676c249f8061353a013b790a7bb9e4090fa73728,dd6de47492d8b48b18da3cfaaec0ecbd777f62a0..fd1594c439a9114c4763f6e176544b3716682593
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\supdates\sfrom\strunk.
- D 2020-03-10T22:55:51.353
 -C Do\snot\sfactor\sout\sconstant\sfunctions\sinto\sthe\sinitialization\ssection\sof\sa\nprepared\sstatement,\sbecause\seven\sthough\sthey\sare\sconstant,\sthey\scan\sstill\nthrow\sexceptions.\s\sInstead,\sput\ssuch\sfunctions\sin\san\sOP_Once\sblock.\s\sThis\nfixes\sticket\s[3c9eadd2a6ba0aa5]\sand\scauses\sCOALESCE()\sand\sCASE...END\sto\nbe\sshort-circuit.
 -D 2020-03-11T19:56:26.290
++C Merge\senhancements\sfrom\strunk.
++D 2020-03-11T20:03:22.100
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1860,7 -1860,8 +1860,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 29d1cc5c3619a88229f18c3c8131228f8a2d151ac3d9203f0c7fc538a996ecec 5f60b527b938c0778e8f725c635ce0dc5ed7a4e01fd6252aa2cdb64da2f625bc
- R 85d11a764a8467f79a2f960f315d2498
 -P fb5a8a9edd0a4f979d6c30278d4ddc73c651f56ae989b4e5983fca36887c5ceb d7f18489978fdbbe3ab317485518cac91a75416ccef55898301afdd76d3b415b
 -R bb18f5b4c4c1d8067c8d33e0ad339acb
 -T +closed d7f18489978fdbbe3ab317485518cac91a75416ccef55898301afdd76d3b415b
++P e05f743f619a6b60d0782ee85c73f6866696962954d7cb3eceb03af79c6a6189 c5f96a085db9688a09793f52ce1ecf033c2e6e2e5873a19fe0fb374b242b317f
++R 31456ba351a9908f0290d907623e53a3
  U drh
- Z bb3c80c49aabc721f930978bf9b4a8db
 -Z 0612eee0f98137a25a8377c8a68a78fc
++Z e9b8258d5115889cfb737fd42109ec8d

diff --cc manifest.uuid
index cfde0a2080bb55587590e17e3978bdaa06278cb9,0b3dd1b4d9c2d66e2af48175e18defc269ef76b8..6c03a0eb932ce1fb892cdd044743c5c909aaf111
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e05f743f619a6b60d0782ee85c73f6866696962954d7cb3eceb03af79c6a6189
 -c5f96a085db9688a09793f52ce1ecf033c2e6e2e5873a19fe0fb374b242b317f
++4945a66237fa3861bc691d5fbef0d40286b596a0902b4f4c032d1d6528bb1a1b