Update this branch with the latest changes from the trunk.

FossilOrigin-Name: 982b753d0b6a3ed9fba33ed41523b2cd42280276

diff --cc manifest
index 103a4b00bcda0c47f38c4b6be80b0fde4eaea835,feae043873319feadb30f0b83be34206b2002bbc..2cc562547468868e7cd111fbc1ad6777b31c87fd
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C For\sa\spager\sbacked\sby\sa\stemp\sfile,\sstore\sthe\smain\sjournal\sin\smemory\suntil\sit\sis\sat\sleast\ssqlite3_config.nStmtSpill\sbytes\sin\ssize.\sPrevent\sthe\sbackup\sAPI\sfrom\sbeing\sused\sto\schange\sthe\spage-size\sof\sa\stemp\sfile.
- D 2016-04-06T18:20:51.565
 -C Back\soff\sof\sthe\sparser\soptimization\sin\sthe\sprevious\scheck-in,\sslightly,\sto\npreserve\ssome\sbackwards\scompatibility\sregarding\ssome\sundocumented\sbehavior\nin\sthe\s'#AAA'\sstyle\squery\sparameter.
 -D 2016-04-11T01:43:33.203
++C Update\sthis\sbranch\swith\sthe\slatest\schanges\sfrom\sthe\strunk.
++D 2016-04-11T09:39:25.021
  F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@@@ -359,13 -359,13 +359,13 @@@ F src/os.c ca10edb445ad2c5fdc7285b49d72
  F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
+ F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b
  F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 +F src/pager.c 91d7462aa2429e30d64c705f75ba36cace90c241
  F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
- F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
+ F src/parse.y 52cdeb4f37634d0ccd2998aab099b7bbb690b0d3
 -F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
 +F src/pcache.c e9c00846d3dcdaa75b288c6f16238c2fe2177823
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
@@@ -1483,7 -1482,7 +1483,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 84de8813c3b4007e3c7c3a286ce13020f2065c7b
- R 54ab030014fa87b230c7ab4f5fdc139b
 -P 16df71284bf081c8b3d3aa57c129a07067ddbed3
 -R 667818294699cc99ee5b525ba6ac6436
 -U drh
 -Z c1e211272b38ff3536c2cdaeb19c42fc
++P 84c557010c211595d2ec80b62c63af1c7f4714bd ef1966c2469a0f5dbdb31a0287bd37badb2b8f28
++R 95ac2720b81ae4f698b1e227fe8fc71b
 +U dan
- Z dbab9fc4f54135fb156cdc6ccf0d8253
++Z 4e2c4b80dd3173e2cb79a80f72f7a7a8

diff --cc manifest.uuid
index 515a3c287404b72f9d19368275f9f4af241678f5,01abafd845dcae7cfd4a182eb96e5f65f85ca8fa..9b0cbf0915b5829980d3620c28849689b231822f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 84c557010c211595d2ec80b62c63af1c7f4714bd
 -ef1966c2469a0f5dbdb31a0287bd37badb2b8f28
++982b753d0b6a3ed9fba33ed41523b2cd42280276