Merge fixes from the 3.21 branch.

FossilOrigin-Name: 292921692c8919d29f0a67d03ca953d5c1c4900d8c8567cceab27513732be598

diff --cc manifest
index 03107352b2ab123c04ea61a9136cc31692dea185,8625e176b30b7fe6a93254190f6ad4c457dfaaeb..f8b45db8f88315e1c84603002d0f9a6502f4e413
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sa\spotential\scrash\sthat\smay\sfollow\san\sOOM\sor\sother\ssystem\serror\sin\sthe\sshell\stool.
- D 2017-10-12T11:33:13.900
 -C Make\ssure\sthe\stableColumnList()\sroutine\sof\sthe\scommand-line\sshell\sdoes\snot\ncause\sa\snull-pointer\sdereference\sin\san\serror\scondition.
 -D 2017-10-12T10:28:30.906
++C Merge\sfixes\sfrom\sthe\s3.21\sbranch.
++D 2017-10-12T13:21:56.153
  F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
+ F Makefile.msc 307701b46e4ac0e2aaa7776ea5936fff21636e991c9d5988584f37d65be9c13e
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1657,7 -1656,7 +1657,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 4b68f424ca9b5d4b0e77065a4e60ec0f70dcce0d01053fd7a6b2ecae9d3a5967
- R 83b72d43ce085ee1e083f5ceb39f739a
- U dan
- Z e19953ef492c0be13869a8f2e3e20ba9
 -P f0a2724f0a255cd5a262f31e4ee1f99ae713c25a9ecc56dc794c95f223453b9b
 -R d1ecfc96a3abe2209d6b1155d4df5e91
++P c36761e1a05c15c48468dd793faf06636f5dcfd3b4314074c4d9c9eac5c2695c 5d0ceb8dcdef92cd72307e532a4a6c269b2c458fecb0bbede0bb941099eebc5b
++R 5e22761bfa955ea525bc4446de4276dc
+ U drh
 -Z 7fd7ee0ab2a7b6f6de891ca66c37b5d6
++Z 1f315bd34e44a8389c3ed773831f4232

diff --cc manifest.uuid
index 2c35c8915a657fd29abe73c1cc9cbc53229e1c35,e2ecde5c63d859bff6d0a6518f0085e2d04d679b..f3e08d87262dabfa92ea4e7164c136e457bda2ad
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c36761e1a05c15c48468dd793faf06636f5dcfd3b4314074c4d9c9eac5c2695c
 -5d0ceb8dcdef92cd72307e532a4a6c269b2c458fecb0bbede0bb941099eebc5b
++292921692c8919d29f0a67d03ca953d5c1c4900d8c8567cceab27513732be598