Merge recent changes from trunk.

FossilOrigin-Name: c7271fbde1aebb15daaedb7f1fa75fe410fd46f6

diff --cc manifest
index f9031784671816d700a3b2fe5ed3ed3c09705839,c6431350373fae0d326ea2ad294b70b0b5c3c674..0d346f639b63446d9fab3690eafd0063de9549b1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\supdates\sfrom\strunk.
- D 2016-08-27T14:13:58.459
 -C Add\sa\stest\scase\sfor\sthe\sOOM\shandled\sby\sthe\sprevious\scommit.
 -D 2016-09-02T21:34:17.199
++C Merge\srecent\schanges\sfrom\strunk.
++D 2016-09-02T23:56:32.342
  F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@@ -372,9 -371,9 +372,9 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
  F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 40928c450320da78bb4bd3ae82818f4239e19b7e
+ F src/pager.c bf5b71bde3e9b6110e7d6990607db881f6a471a2
  F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d
 -F src/parse.y ed6990c2d41eb0302eda90d5009c51fec792c850
 +F src/parse.y 0e0b6d46a990d01e4ca1e9d7e1d2d9b5a98f6bcb
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812
@@@ -445,7 -444,7 +445,7 @@@ F src/test_windirent.h 7edc57e2faa72702
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
- F src/treeview.c 15406fc49bd7fb1616b4c19b8d1d9fd85211ca8b
 -F src/treeview.c 70329ef46b86f94b16a98aacced793e0692217b5
++F src/treeview.c f51b75a28b377adde9f79bc3deb6c7770bcf97c0
  F src/trigger.c 11e20b3b12c847b3b9055594c0f1631266bb53fc
  F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
@@@ -457,10 -456,10 +457,10 @@@ F src/vdbeInt.h c59381049af5c7751a83456
  F src/vdbeapi.c a32d61b7dd05e6890d8fd44d2805f55e2f5ba9f3
  F src/vdbeaux.c 83458783d241cfd6691141c8a105832ee50258e5
  F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
 -F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
 +F src/vdbemem.c e67dc6d8177fd1830efb5d15e17793408251a187
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 5ca4fa8b028f9e2ed4793ee1670911a83cfcefd8
+ F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
@@@ -1521,7 -1511,7 +1521,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 f51248dcfa22e989dacde41021e96a65f12c5ca8 4d43c4698eef4e3db7556813f0274b4018c7c2b9
- R 00d98e75a44793aa199bbed06e05b243
 -P d9d8a048d4b621435870b4f8dd13b2938ac2f8fd
 -R b03bceee349e62c9e4b232e967e75375
 -U dan
 -Z 94198719997091b0b262fcfd62b5468a
++P 082fd5f8ac227dbb983da0a772485268af40a484 9bdf7ca1b317fe0ba7efea38fb395bf6130ac89a
++R 5ef4ae610db43c409abf4a916ff574b9
 +U drh
- Z 05fa8b41bb716a6f3fffdda76bb03c28
++Z 8a1867c9ed1b748f87443a20db67a6e2

diff --cc manifest.uuid
index 60b210d6db556abff1133a8cf6531ca642f8a784,33cb4d6b33d67899e836184d4b687df691448ef4..f54ff68f8fb068c0ea56a5d3ca7effc0fef98116
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 082fd5f8ac227dbb983da0a772485268af40a484
 -9bdf7ca1b317fe0ba7efea38fb395bf6130ac89a
++c7271fbde1aebb15daaedb7f1fa75fe410fd46f6

diff --cc src/treeview.c
Simple merge