Merge fixes from the 3.21 branch.

FossilOrigin-Name: 18d4654fd161900f98ff435ea9e0a3c44b9972f84ee9f43096f9998f844ff857

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index c2dd3cb1eb2965efb302b29d8134a78e092d218e,ba7a68f797b1cbb6be10cf1abd1a0fe390ed3328..e5589b7672fb0a42ea4b2926c177ff6c21be8fbf
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Add\sthe\scheckfreelist\sextension\sto\sthe\scommand-line\sshell.
- D 2017-10-11T18:26:26.636
 -C Fix\sa\stypo\sin\sa\snumeric\sconstant\sin\san\sassert()\s-\sa\sbug\sthat\shas\sbeen\spresent\nin\sthe\scode\ssince\scheck-in\s[79e22b95038]\son\s2010-03-30.
 -D 2017-10-12T01:19:06.385
 -F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
++C Merge\sfixes\sfrom\sthe\s3.21\sbranch.
++D 2017-10-12T01:24:36.582
 +F Makefile.in 05d02ce8606a9e46cd413d0bb46873fe597e5e41f52c4110241c11e60adff018
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 148d7cd36e556f5c257232cd93c71a1dd32c880d964c7d714990d677cd094589
 -F Makefile.msc 307701b46e4ac0e2aaa7776ea5936fff21636e991c9d5988584f37d65be9c13e
++F Makefile.msc 523fd246fd801689c766945f6450615d3784fda2dc04993bcafc796ac6afd8df
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1660,7 -1656,7 +1660,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 4e89406248f51d3b83d61e5472fb493f3d3b4ff2a69bf256c7e15445eeb2f3ec
- R 0bf65201c138febf2eab9baca075a19d
 -P 31eee0e4bffc5419e076a589049bfea7327dfc666fcc2767c0b700f506055c4e
 -R 53da87efcb541e81caf23f4e430fb62a
++P 48418f2ed5ab1cb270776166141ce32ed3ebf22ed4e33a66a204d4fde9d11f52 f0a2724f0a255cd5a262f31e4ee1f99ae713c25a9ecc56dc794c95f223453b9b
++R 9b46eb5073fd5db6110bab2092230089
  U drh
- Z f892c9c71f9811efc31d97f9328db29a
 -Z 3fb702a07bd6ea398ba326fd478602ce
++Z b5c9a13e106677edbcab94b5f19597c5

diff --cc manifest.uuid
index eb5db275813f7d22bc8de6970c5a7dc72be23461,e291c426f636765f09c6e197f10e7fd172ec1e52..f8e3904fb942d24adcd29b1bb700f2bd1dc7501d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 48418f2ed5ab1cb270776166141ce32ed3ebf22ed4e33a66a204d4fde9d11f52
 -f0a2724f0a255cd5a262f31e4ee1f99ae713c25a9ecc56dc794c95f223453b9b
++18d4654fd161900f98ff435ea9e0a3c44b9972f84ee9f43096f9998f844ff857