Merge trunk enhancements.

FossilOrigin-Name: f1c284dd1eee9ea2edc990ad5bff3412c6d7aa12e6c33151f71bc003732dbbf0

diff --cc manifest
index 3ec3b2670b7862985ea5460604dc4b01d711aa6e,ce27245686fe32c4af98245fd1f3163a7981bfdf..3f4f447fa67a19c509094d01c9298362206c23b7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Minor\sbug\sfix\sin\sNATSORT\scollating\sfunction.
- D 2020-03-30T19:38:20.541
 -C When\scompiling\sthe\sshell\sfor\sWinRT,\savoid\susing\sWin32\sAPIs\sthat\sare\sunavailable.
 -D 2020-04-09T15:31:22.553
++C Merge\strunk\senhancements.
++D 2020-04-14T15:24:25.823
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1860,7 -1860,7 +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 79fcaa8e07f61ea84e24f7e30d2426a7d30bfe6316d5a89e5662b03b0c8943f3
- R e448dec24a214320172f787a96e91122
 -P 10306118e8591e727af477a1a15d136852d21170e645bd0e75f7c88346b037d7
 -R 979d0103f7b3acef2369409e370d6fa7
 -U mistachkin
 -Z 484824f16820465db78cbfdb9a5d496b
++P a61be1092732e4298e8b601c150555cb8c6ff79fec666f1889bfc71ddb6d35e9 85d3dc8c50d8dbb8eac1956e8976e861d3b671e03355ca9257060fa3dca51cc4
++R 874e917329c44536fb1e78a77371e35c
 +U drh
- Z 982925efe7000efed9889a0f000d8bb6
++Z 6d8f7c6d5f125ae0d49e4fa453ab7770

diff --cc manifest.uuid
index 38c8f231d8144d3f9144228976074b7a017b34de,fb32b5bfff7570657b4644883e3205386b9208d0..7c3c623a16d18069d16042a164c007c78986f26c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a61be1092732e4298e8b601c150555cb8c6ff79fec666f1889bfc71ddb6d35e9
 -85d3dc8c50d8dbb8eac1956e8976e861d3b671e03355ca9257060fa3dca51cc4
++f1c284dd1eee9ea2edc990ad5bff3412c6d7aa12e6c33151f71bc003732dbbf0