Merge bug fixes from trunk.

FossilOrigin-Name: d76e12066fa6950f877cbe33b1892e2b0afa948978815d5b9a90cde1fff8ec98

diff --cc manifest
index 7f1e56cfbd21a917955da8997f1ba35374f765cd,3d3fdb11e9b3d5b89852b3bb16da3c9f561ef474..9adf601335336fddd29d5d0c85e956c3be9c4ff9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\ssupport\sfor\smeasuring\sand\sreporting\scoverage\sof\sthe\sparser\sstate\smachine\nusing\sthe\sSQLITE_TESTCTRL_PARSER_COVERAGE\stest-control.
- D 2017-12-26T18:04:23.951
 -C Faster\sand\ssmaller\simplementation\sof\ssqlite3AtoF()\sbased\son\sa\ssuggestion\nfrom\sCezary\sH.\sNoweta.
 -D 2017-12-26T14:46:20.800
++C Merge\sbug\sfixes\sfrom\strunk.
++D 2017-12-26T18:14:53.001
  F Makefile.in ceb40bfcb30ebba8e1202b34c56ff7e13e112f9809e2381d99be32c2726058f5
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 6480671f7c129e61208d69492b3c71ce4310d49fceac83cfb17f1c081e242b69
@@@ -1687,7 -1687,7 +1687,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 7eb0198d0102e97e4b7ad9e359d95985e55e09c510ea4b360265ac8feb9ed814
- R e80238b7e2c8eabf5efe2bfae85580fc
 -P 6a790b67a0a5c698526db16ea262b13ecdd1b6ca74e80bdccfcad88ddbdc933a
 -R c3240df89b3aa2504611bdd745085460
++P 1253a872dbf48656d4efd588ab61223a5ac550d9b2b932249d6ba585276ba573 fd2e0e7a770c2ce9355068aad1024c3d2861c104fd3be304a91c55ca742155fa
++R 2e2b89187d0becf4c2715a566c5e3287
  U drh
- Z d5a5596d3c74652b6ba118722fb4ea75
 -Z 3dc20c6e2c72c6078d443025934f152b
++Z ade3bde65575a1ed1ca48cdbaee1adc1

diff --cc manifest.uuid
index dce691ea27d5bb3cd9cf0eec01f48543b23cf341,bdfe92339c05d6ff93d4421812fc1b860f202ab9..e7382751774127c8ad0cb3ca88585f120444a32f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1253a872dbf48656d4efd588ab61223a5ac550d9b2b932249d6ba585276ba573
 -fd2e0e7a770c2ce9355068aad1024c3d2861c104fd3be304a91c55ca742155fa
++d76e12066fa6950f877cbe33b1892e2b0afa948978815d5b9a90cde1fff8ec98