Merged in trunk.

FossilOrigin-Name: d662796c658997be13fdc3b77ad97101b9513da53fd0b824d7a4050cac3f7eba

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 773decce4e61049e644d4683e5802a81b79c39e3,6359633be1295ff698983dbe9a5621e610c68493..382d770b782440c2cc409fd2c4953987d086119d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,13 -1,13 +1,13 @@@
- C wasm:\scorrected\sthe\sisInt32()\scheck\sto\saccount\sfor\snegative\svalues.
- D 2022-06-25T21:41:26.982
 -C Improve\saccuracy\sof\sjulian\sday\smilliseconds\scalculation.
 -D 2022-07-19T21:12:54.087
++C Merged\sin\strunk.
++D 2022-07-20T10:09:19.404
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in fff0e19d74fe31d6c2960e72b79a1c82aeb971b32fa5002ace2ceb906b9917e5
 -F Makefile.in 24d67c669635fba48c37fa5eacb01fcfde9fc522f152f60d3058c2dcf34da8da
++F Makefile.in efc6e3d5c558ef5abb20cad20cf96bcecb86755ce45a858e6c64bfbd9749fd30
  F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
- F Makefile.msc de7cb3e095ce2fdc33513ccd76ebdaeda1483d0ddab0410fe65cbdeadd4c0ee1
+ F Makefile.msc d547a2fdba38a1c6cd1954977d0b0cc017f5f8fbfbc65287bf8d335808938016
  F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
- F VERSION fa8e7d2d1cc962f9e14c6d410387cf75860ee139462763fda887c1be4261f824
+ F VERSION 8868ddfa6e1eee218286021a94b3e22d13e550c76c72d878857547ca001de24a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -1979,8 -1981,8 +1982,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 ac876ab9913332c9a5e3045824bf92a2501707aecfb13906d5c280302d9878a9
- R c0ca90334fea302fa7780f66e0b99cb5
 -P 22d280a5cd395abbedcfffbac3d3b3a614c327be25763ca380c1338a2a7bd33a
 -R 358f17e3f8be659125138359345ba38f
 -U larrybr
 -Z 66841ff8e7be7e09568cdaf4bf69cc26
++P 7223f4bb588b6c759754ef26cbefbb172e767eaa80989b8f9ef104d4e8b9d856 e5e9311863544ef30dccd3bd0b3a048a864a650e69cdf9aab13dbe32a4777b51
++R 54d568f7dd2b6d64e94dfc8d2608eacb
 +U stephan
- Z 5c1bc27cd9cb9a8a18904e79ae01eef4
++Z 375c5b8cc4c764d044f949cc6f3c9796
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index a93b8e8b1423ad17425d8b866b809f979963d553,1ca07adc23be0dd28ee5a0118a5818a5271f93a8..e9e70fb739e31faa2c023ba400fb93b646702bc7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7223f4bb588b6c759754ef26cbefbb172e767eaa80989b8f9ef104d4e8b9d856
 -e5e9311863544ef30dccd3bd0b3a048a864a650e69cdf9aab13dbe32a4777b51
++d662796c658997be13fdc3b77ad97101b9513da53fd0b824d7a4050cac3f7eba