Merge enhancements and fixes from trunk.

FossilOrigin-Name: 3fd050c343256c0748256ef183b46df04d9e0da0f81b841dbd336034402b36ab

diff --cc manifest
index 83b166c1c1b88132a2d2109e1d63dc2a3b7d0a6b,46c79b6a423924ca3a63c458b50a2d6782bebf30..b46d57dca29a7d12d650edc618e6eee132fa9d8b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sin\strunk\senhancements.
- D 2017-06-07T16:25:25.048
 -C Update\sthe\sdocumentation\sto\smake\sit\sclear\sthat\sthe\stable\sname\sparameter\nto\ssqlite3_table_column_metadata()\smay\snot\sbe\sNULL.
 -D 2017-06-09T11:43:53.133
++C Merge\senhancements\sand\sfixes\sfrom\strunk.
++D 2017-06-09T15:14:41.710
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@@ -406,11 -406,11 +406,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c adf3ef9843135b1383321ad751f16f5a40c3f37925154555a3e61653d2a954e8
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c d93205e43af302d9eb147fddecc956509ee9d0dde6297ee3f93c591f60f0e295
- F src/shell.c eca7e7fe8dae859aa56e462c5b35c735976fa1e5e1d7a90fd5a32aa4615c1825
- F src/sqlite.h.in e644e75c21ab6247ebd8bca07a999d7d108fe8be00adc14d8c4b6004f1e75c34
+ F src/shell.c a43292634af8e3528fec5c6e3360f122fc807a0af619d566ea44fdb98dcfca78
 -F src/sqlite.h.in 67fa8bd29808e7988e0ce36c8d4c6043eb1727f94522fc612687aa5af51931e6
++F src/sqlite.h.in a41f8ca1bb1e20bcd40c75f238cc1c622295e60b6a88f89e76251759cba7d125
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 82800fc19fbdeb35a0773c5d727da717652f4c421d191d2460219c7aab953462
+ F src/sqliteInt.h f90955604b4d8e5a1f672bd230978640be89e0bbbf833d352cf4945ce3a799df
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1582,7 -1582,7 +1582,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 4a25c5883380fe5990d8180adb58c3bdc7a3d081bc4c69cd4de3cd57074fb251 234ede26e30f20e6c33002739ed8be35dbfb5c77700bd857ff31072b9b7df347
- R 0957dad5bbe072099826cf9a4a9a3885
 -P 3168e2c92ad0a0dafc78a27ee1d87ac89f426585f506f418a0182141335dc68b
 -R 58bb1b2ee6d8923f8cbdc89765f652d8
++P f8bbb608cbf6c245628e3d362e9181fb3dc402b1d8241bcb687caf395f63c916 2881ab1ed24ed72760086785bdf224c4e687cf39a02fd349ae13c6e1235e24da
++R 157bd8d676fe7887b1ec315b63de1888
  U drh
- Z 6991b6c9f5798221e32381bb8967907a
 -Z 16b157f827867d5307cac641f1800459
++Z a775f4e973c6d62fa3ef92f914d45d35

diff --cc manifest.uuid
index da9d04a97cadd5cac6f22584409eb4081b8c2389,d35d6017677e8116219fe5722c31958e82148227..d81e0229b9722ecf774ee6f193f7ff18c53b01f5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f8bbb608cbf6c245628e3d362e9181fb3dc402b1d8241bcb687caf395f63c916
 -2881ab1ed24ed72760086785bdf224c4e687cf39a02fd349ae13c6e1235e24da
++3fd050c343256c0748256ef183b46df04d9e0da0f81b841dbd336034402b36ab

diff --cc src/sqlite.h.in
Simple merge