Merge all the enhancements and bug fixes from trunk, since none are

destablizing.  Call this the second beta.

FossilOrigin-Name: fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca653da4

diff --cc manifest
index 9e350ba26365f19d77dcc6ccbc48493aa8a1db6b,da985ae44fd7c989d2fdeccfa31778f1f54d3964..606e66d38d89aca8baad1d1e728c85144c827a03
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Updates\sto\sthe\sMakefiles\sfor\sMSVC.\s\sCherrypick\sof\s[ac8786f3f9f35cb6].
- D 2017-10-14T19:58:37.221
- F Makefile.in 9c9f4dea3f622464cba9768501aceca187d2bbae10b60bf420b531cd776fe5c0
 -C Catch\sand\savoid\sa\s16-bit\sinteger\soverflow\son\sthe\snumber\sof\scolumns\sin\sa\ncommon\stable\sexpression.\s\sThis\sfixes\sa\sproblem\sfound\sby\sOSS-Fuzz.\s\sThe\ntest\scase\sis\sin\sTH3.
 -D 2017-10-21T14:17:31.555
++C Merge\sall\sthe\senhancements\sand\sbug\sfixes\sfrom\strunk,\ssince\snone\sare\ndestablizing.\s\sCall\sthis\sthe\ssecond\sbeta.
++D 2017-10-21T17:17:17.187
+ F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 4a7ebdaacec1abd415d2847c8f5b42053c5963294e925672d43d2972a5bb2cb6
+ F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1585,7 -1592,8 +1592,8 @@@ F tool/libvers.c caafc3b689638a1d88d44b
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
  F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 -F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
 +F tool/mkautoconfamal.sh 422fc365358a2e92876ffc62971a0ff28ed472fc8bcf9de0df921c736fdeca5e
+ F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
  F tool/mkctimec.tcl dd183b73ae1c28249669741c250525f0407e579a70482371668fd5f130d9feb3
  F tool/mkkeywordhash.c 2e852ac0dfdc5af18886dc1ce7e9676d11714ae3df0a282dc7d90b3a0fe2033c
  F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
@@@ -1656,8 -1664,7 +1664,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 de20133d44773f0b3b8869db5c1cb2a90f0426a54c7f40d12a930003343ad8e0
- Q +ac8786f3f9f35cb6fa72c65f5ca41cc6659f4702cd29ab0c9dcf04d3d1189090
- R 8e422c1ee06cd57625ef547ccd862b5a
- U mistachkin
- Z 0ed36b5b53069fc1c0ccb6054caf79bd
 -P 6ec82acde81a46a75ed5931fc7dd813f2523753106ad7b8f0b544b9da9824d5a
 -R 201775ba1e14aa2d5f8d0e57defde230
++P 92eb721faefcdd8396072722d3e4d7ca41b860b306e4bb0f0191dde8f30d0add 6ee8cb6ae5fd076ec226bb184b5690ba29f9df8cfaef47aaf13336873b4c1f6c
++R cbea5558ab489dc3dc438260e1496797
+ U drh
 -Z bad3386d6737a5472f5b033811b6e996
++Z 9e651e977f775eeb3bfb6c192219eebf

diff --cc manifest.uuid
index 524d43870cbf5ec0a6163b7add17a11a0f1f4f7f,60279d92062e57f83542825e7046555770a0cc62..85577245596717fc133f554cf3dcdc75cccd7d2b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 92eb721faefcdd8396072722d3e4d7ca41b860b306e4bb0f0191dde8f30d0add
 -6ee8cb6ae5fd076ec226bb184b5690ba29f9df8cfaef47aaf13336873b4c1f6c
++fb3ee1b7cac09e4950e4f48b44c277e4f391cb6c8f069644732d2389ca653da4