Merge latest changes from trunk with this branch.

FossilOrigin-Name: 45467ee49872f495d5276cf830f10c3cf4ac8e3c

diff --cc manifest
index 24ba903e1f072335df6fef1ad49cbbeaf36cc90a,4e86475b1474f3c0a25423296d48381412bd8258..61077e7077a54c41fddf8c17ab2d1af6cc386910
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\srunning\ssessionfault.test\sand\ssessionfault2.test\sas\spart\sof\sthe\s"inmemory_journal"\spermutation.
- D 2016-04-28T14:54:54.590
 -C Use\scomments\sto\smark\sseveral\sbranches\sas\soptimizations.\s\sNo\schanges\sto\scode.
 -D 2016-04-28T14:15:12.903
++C Merge\slatest\schanges\sfrom\strunk\swith\sthis\sbranch.
++D 2016-04-28T14:59:05.489
  F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
@@@ -387,7 -387,7 +387,7 @@@ F src/sqliteLimit.h c0373387c287c8d0932
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c 0b0b9483649d48846655ea30345bb3fe917555d6
 -F src/test1.c 922fd57b211e14761ef846cebfd09a1922771960
++F src/test1.c ee8fd5c32acb93fb6fe885ca4801cfab85f5563f
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -1484,7 -1484,7 +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 045edd4b17c6b76079ac90773c035d8c1f8d525d
- R e73b09d1e2cd9d2d69ece961d0e8362f
 -P fcf85bfe50b254e825ee63a4cd0aa0b333b06eed
 -R 197c644a6cd9b0806f84f77482d9fe15
 -U drh
 -Z 413f6650964e5d2ab342130728703294
++P 5973d3bf2e5aa979ccc9a4a3a0eb08b67098b499 33e627472780b872716c504f2d585cc057c390a5
++R 66281bc4e8738b7ab348496eadeeb2b1
 +U dan
- Z aff771281cb418c17327081bdcd3c618
++Z 4d2c4cbb1442cfb28a5ae33052756c7a

diff --cc manifest.uuid
index 7a52ce8e55a3f9a8ed4b701f6dee4da03d11320b,abe023c7528aac7e97197053b1a80c4b7eda8315..b1984ea171109abbb7f152c4c9a992377db94e08
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5973d3bf2e5aa979ccc9a4a3a0eb08b67098b499
 -33e627472780b872716c504f2d585cc057c390a5
++45467ee49872f495d5276cf830f10c3cf4ac8e3c

diff --cc src/test1.c
Simple merge