Merge latest trunk changes into this branch.

FossilOrigin-Name: 803156cba8b056a1cb8d1bb186a57454afe72341abe7de1dfe529234c3415cd2

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index c7890a8a9808ee03874afa8ec1cd7033f893bf25,1c8585e662181c72baeff72af974aadb014d49ae..d58279c9aeddd07388cbd045d44eb0cc892cf0f4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,11 -1,9 +1,11 @@@
- C Add\sthe\sshell\stool\s".ar\s--update"\scommand.
- D 2017-12-13T20:17:18.759
 -C In\svalueFromExpr()\sonly\sgenerate\sa\sOOM\sfault\sif\sthere\shave\sbeen\snow\sprior\nfaults.
 -D 2017-12-13T23:47:55.478
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2017-12-14T13:55:01.572
 +F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 +F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 2eb985916ed36fb4ba73033d030090fbf22d4d972e06caee19e7d89fb305a8ab
- F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
 -F Makefile.msc a2492b29176edc3c754aa7a2f7daa20cd3fa20a56e3ee64e376092836177c42a
++F Makefile.msc 72b73110e9a9e95681fbc84f5c43e85f8a506ccbac3a2455df1d3f20ac27df64
+ F README.md eeae1e552f93ef72ef7c5b8f6647b368a001c28820ad1df179d3dae602bef681
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -474,11 -473,11 +475,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 17e220191860a64a18c084141e1a8b7309e166a6f2d42c02021af27ea080d157
 -F src/shell.c.in 6ffed0c589f5aff180789a8c8abf5b2d3e2eea7470c86b30e797887cb0c9d0e5
 +F src/shell.c.in 12313c0500b9b1958507d3a432c192f73f86da112f0f37467636530696d13152
- F src/sqlite.h.in 8fd97993d48b50b9bade38c52f12d175942c9497c960905610c7b03a3e4b5818
+ F src/sqlite.h.in 364515dd186285f3c01f5cab42e7db7edc47c70e87b6a25de389a2e6b8c413fd
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
- F src/sqliteInt.h 4c910d9c0d88a90e8639a4f83ef05f701ccfe731cf593e757444074f01df4964
+ F src/sqliteInt.h 55b8e7da85947eb61b13d4d2523ccdda7800a13e987c3fc4ca73d8518bbf02fa
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1682,7 -1680,7 +1683,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 32c4fa2552bb0fa7d7d143108457efae7a756d6cb14b1d59312e56efac3b2656
- R 656e4fd0036ab859f27379daf7289767
 -P 6de21deac469ab25378656f6f58115a92f5892428c6f2f3545c9bafac37e4a41
 -R 44abcc3575bcbddb8f261c0eaf812ba5
 -U drh
 -Z 3fcdf29f818607817f06d87e8d680060
++P 825e3c037b03fc09d581aeda0193ff1d4062404414c7354cb649f99aa9022d25 3765aaf712998af5ffb6bc680a0c1419f2b5deb47ecbc1835ba5879127c4dbe3
++R bf083f80c8163c105f680457377723eb
 +U dan
- Z 57a0e73a5198163aa720919c6750aab2
++Z 36133c008e2dcaa09c3c6c120c31dee9

diff --cc manifest.uuid
index 937d78b439d256caa76def0144c3909614f8ba33,f81e89e40c39e2c2759224cee0424d029620b195..4a8f53dbe3614e869a8038c7cfb7daff8b114991
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 825e3c037b03fc09d581aeda0193ff1d4062404414c7354cb649f99aa9022d25
 -3765aaf712998af5ffb6bc680a0c1419f2b5deb47ecbc1835ba5879127c4dbe3
++803156cba8b056a1cb8d1bb186a57454afe72341abe7de1dfe529234c3415cd2