Merge enhancements from trunk.

FossilOrigin-Name: 9682c0433c04713c28bd9105a7e20af7372f873e

diff --cc manifest
index 6d6c99e5a20025e7a18f465d6eb1230c719ad57b,7dc90def4336d80f66ad6e8705e9217089f1cb4d..6c3dd2f0cc88ea0329073dc4a1356164b3700846
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sa\stypo\sin\stemptable2.test.
- D 2016-04-11T19:24:56.197
 -C Add\sthe\ssqlite3_snapshot_cmp()\sinterface\s(available\sonly\swith\nSQLITE_ENABLE_SNAPSHOT).
 -D 2016-04-12T16:04:07.576
++C Merge\senhancements\sfrom\strunk.
++D 2016-04-12T16:10:10.308
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
+ F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -385,9 -385,9 +385,9 @@@ F src/sqliteLimit.h c0373387c287c8d0932
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 56569acc73d36e836b64aefecbbb709a92ba0077
- F src/test1.c 7187b7e924bfc97780e6fd2a40dad94a32bddca0
+ F src/test1.c 457c601302b8a0f5960dffd17b6a2877603841dd
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
 -F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
 +F src/test3.c 0df6f8dbb4cbaa7106397c70a271fa6a43659042
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
@@@ -1484,7 -1482,8 +1484,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 c6d0d441a1ab4873caedf2f23543444cea5d7f5a
- R 24eeba37ecde224a7caa9038421064fb
- U dan
- Z 162e6a9a240e1cae98b0ba71f957c9d5
 -P 07f10deabb0f4207408142541e3913d638dfcdeb 8fc834741bf6c8a832a180795c3d6f5c3dcfcd62
 -R 5656733bddcb2f7451211326ac2ed136
 -T +closed 8fc834741bf6c8a832a180795c3d6f5c3dcfcd62
++P 04b1890fbc19eb3fa935083c1664fbbfb67dad93 7e7289655185e7643ead6d685922528bc4d9e0ae
++R 5d35ce920fcfc7013551c54ce7d1cde0
+ U drh
 -Z b8985dfa1dcfaa5a463be54da15766b9
++Z 97342c74358cb773c29965a93119c3f8

diff --cc manifest.uuid
index 3e7e5faf242599c4a268c0b4c0b2cd820d01ef62,75b5b1aa0b15afd2ef27026e1906e84ee047ae01..01a6eda77e870cf1fcfb305a34df0715956544f5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 04b1890fbc19eb3fa935083c1664fbbfb67dad93
 -7e7289655185e7643ead6d685922528bc4d9e0ae
++9682c0433c04713c28bd9105a7e20af7372f873e