Merge all recent changes from trunk.

FossilOrigin-Name: c23ef5e231908450da7461233bc3f4a38ab11ff351ae0c34d91e82c61ad13b3c

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc manifest
index 94d3c00be54f5316baa23016974ffa10791ad8fc,2b13eab25a41dd746939c2ea5e93406763207e45..8496811264e4340a18ce405c7f3e00f717c54c44
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\slatest\strunk\schanges.
- D 2017-04-08T00:25:38.513
 -C Disallow\sleading\szeros\son\snumeric\sconstants\sin\sJSON.\nFix\sfor\sticket\s[b93be8729a895a528e2]
 -D 2017-04-08T18:18:22.572
 -F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
++C Merge\sall\srecent\schanges\sfrom\strunk.
++D 2017-04-08T18:24:57.413
 +F Makefile.in 227347646e289e3b016ebb7a391ad6ed4ab56525834d56d47d1a83b8d97d6989
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
 +F Makefile.msc fed3d46b77ac93f76f85ce6d285ea7640de205d165c77b95e331e02d834e1296
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
  F VERSION 0a0e02e16b44ea735b40118fc844311b2ab0d35b25fbeda5120aee62f973f663
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -271,9 -271,9 +271,9 @@@ F ext/rbu/sqlite3rbu.c 2a89efba9eeba8e6
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 3be16f2e49220ca778fde2dd1d1bf67815db4888bcc0cd0a8145dd9a3bb2e87c
 -F ext/rtree/rtree.c 37c603c6b8aed1a760661ceb5a025bd36bac14cf56d59949bd8de14b2a17e9ed
++F ext/rtree/rtree.c 50946312ae179cd64f7ae5f19198635a56570385a0d34b35107a59b4c86e8394
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
+ F ext/rtree/rtree1.test d5f0ba215b3bd1d05269ada86e74073b8445852aa0d33a63e10ec63a09c39473
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test 2cafe8265d1ff28f206fce88d114f208349df482
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
@@@ -405,12 -402,11 +405,12 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c afcf31d8ed7c890328a31d3f350467ccd273af345b24562382b398d6d9cd0664
- F src/shell.c 3680725485ce5022dc683d593e8a4b95f973597d843ddb8be788d7dc24d16de9
+ F src/shell.c 70f4957b988572315e97c56941fdc81fd35907fee36b7b2e7be5ec4c7e9d065d
 -F src/sqlite.h.in ab77e511620eebbd4ed7e4f52fae697b6870dda66c945acd2d3066f99c98e17e
 +F src/sqlite.h.in 7e99920e98319e8360cc260eef3da768799a18f4aecf6e0ef9a37a58fcc8f5b4
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 -F src/sqliteInt.h 6cf244eb06119b44e155717708e54f0638c35e9bd8ef59ea570eb1f093f0da44
 +F src/sqliteInt.h 46dc79e5afefa1fc26826e7aa01fe2d71c7e001f220743374af048e5e5588ba0
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -472,10 -468,10 +472,10 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
- F src/vdbe.c ca1e58fc853ad55b508493144fdada650ae4756722f3c53415f7926ec995ec08
 -F src/vdbe.c 808fda3d50f544120d27c731449b524b4ec8f8b0f734b228831078f0ba53ecb9
++F src/vdbe.c 94a909c5e4707ed7970678932fb4f45f1d2f2f69fe44a090abed94b363a8f438
  F src/vdbe.h caa5346d52bae2a3c8c1dcfa60a7a4dc878a9e3865cb8239da55808b316c8158
  F src/vdbeInt.h 5db089ce18c4feff8820ec6e4cac2d2c82e03d4b1d96f10a6e43832147b8dffe
 -F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
 +F src/vdbeapi.c 995f635640bdbc38d95f24c467b87e79646b4ce4
  F src/vdbeaux.c 0ecacf8c7ca93e430b30819b8fc9b2c1ffe88202d1437e88c08a1f0b6159c58c
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 8bb4dd22837da969bfda25ef3f92d41aaad192328f89a0951290d5e26ad7dbc4
@@@ -1575,7 -1570,7 +1575,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 ed28f15e052b34f6642c68711fa3ed765c396262327fd3dd9c520b346a4deb81 7307352988174a6c2756dbbe200bf62a45fb4cc1da7faa2c6b0f75e229eab703
- R 637561b6d19adc336d692283417f7f26
 -P b9a8c2b9bec9f537b2d5aff6659a5748b1f70b53519a1f9dfceb5209154eca8e
 -R 670b9d233206c31ff293234250b6b1b3
++P dd16439ea12b0384abcb0cab3768a5933dabb0cf77706c6ec9797209794b04ab 204e72f0080e8f08f99978870bd3cb9d59b068ecffee82192d707c650548b43b
++R a08696cbb457a66829e57685e6c1a4d0
  U drh
- Z f8b51e3e11cef4f1805a54fb50d8968e
 -Z 7379463864511f4d80e83d3921199e22
++Z 6a47619c0e0342502c183719fabb9040

diff --cc manifest.uuid
index cdd13d8440afa2fd29c2916b98f63fb531be9833,149c2506cf8d2f6d0967088624d55463609de020..210888256bc16188a65e26cce5321dd51dfe5d34
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dd16439ea12b0384abcb0cab3768a5933dabb0cf77706c6ec9797209794b04ab
 -204e72f0080e8f08f99978870bd3cb9d59b068ecffee82192d707c650548b43b
++c23ef5e231908450da7461233bc3f4a38ab11ff351ae0c34d91e82c61ad13b3c

diff --cc src/vdbe.c
Simple merge