Bring in the latest trunk changes.

FossilOrigin-Name: 75d8517703f7efa33437079108e2c4ef0de1a118bbe1f4a86afdc34da09d3008

diff --cc manifest
index ec7a538103cc34358324e3ab07913f38b1ddf134,1c8585e662181c72baeff72af974aadb014d49ae..1b36095a3fdcdd50ab1a09a3536c14d9bd626642
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\sthe\slatest\schanges\sfrom\strunk.
- D 2017-11-15T16:29:02.752
- F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
 -C In\svalueFromExpr()\sonly\sgenerate\sa\sOOM\sfault\sif\sthere\shave\sbeen\snow\sprior\nfaults.
 -D 2017-12-13T23:47:55.478
++C Bring\sin\sthe\slatest\strunk\schanges.
++D 2017-12-14T14:50:49.020
+ F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
- F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
+ F Makefile.msc a2492b29176edc3c754aa7a2f7daa20cd3fa20a56e3ee64e376092836177c42a
+ F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1678,7 -1680,7 +1681,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 063a03a3779e8c032dd006712facaaa6d60964425701ea10c753ff981a8f2bd9 3925facd942c9df663f9b29b1e6f94f6be14af8c2b99eb691bfc836b4c220826
- R c7a14dabad9b6d1a92ae6a806b590590
 -P 6de21deac469ab25378656f6f58115a92f5892428c6f2f3545c9bafac37e4a41
 -R 44abcc3575bcbddb8f261c0eaf812ba5
++P 1a1a73b821eb1a22ca335f582a0aea31c71ca9f5b09d54f26409691c90e38c4a 3765aaf712998af5ffb6bc680a0c1419f2b5deb47ecbc1835ba5879127c4dbe3
++R 29a07f33957881a5b837419ff7f21683
  U drh
- Z afc7a4b7b3683c496a44306e363185c7
 -Z 3fcdf29f818607817f06d87e8d680060
++Z d18bd4436a6dfca865f7b12ca3ce5865

diff --cc manifest.uuid
index b1cf4103fd3789d7cd1208979656af885cb58fb6,f81e89e40c39e2c2759224cee0424d029620b195..29cb2dde87dd3b26d8f203a9fc25c0ff35f1594e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1a1a73b821eb1a22ca335f582a0aea31c71ca9f5b09d54f26409691c90e38c4a
 -3765aaf712998af5ffb6bc680a0c1419f2b5deb47ecbc1835ba5879127c4dbe3
++75d8517703f7efa33437079108e2c4ef0de1a118bbe1f4a86afdc34da09d3008