Merge updates from trunk.

FossilOrigin-Name: 59d1a3bb6050a812c4eb0d25ac53327081b9efed

diff --cc manifest
index dbfe67b412fbf9f485ac2954759bd578d2212021,340322d8fae7be59800100a1d6a14fed9bf89d06..d47bc0141621e4b91a9ded0d4bd1f48dc44863a8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\sthe\s'mkvsix'\stool\sitself\sto\ssupport\sthe\sVisual\sStudio\s2015\sCTP.
- D 2015-04-19T23:39:05.488
 -C Fix\san\soff-by-one\sassert()\sin\sthe\svirtual\stable\sargument\stokenizer.
 -D 2015-04-19T23:11:10.399
++C Merge\supdates\sfrom\strunk.
++D 2015-04-19T23:40:55.108
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -190,7 -190,7 +190,7 @@@ F src/global.c 4f77cadbc5427d00139ba43d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c f43325e75175e3ca325f164464bb6475e3653d6d
 -F src/insert.c b152e71457c40a3967ceafa9e7cbbb52e9ead2c1
++F src/insert.c 8176ba5bad8fcef643558ca5708f33ed05a4035a
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@@ -1251,7 -1251,7 +1251,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P d05becd873a03a366843a34e7f4c732dd8f88c86
- R bb1f1e19d70e43199cc9b8784e79ff68
 -P e73ac0cbac257d2d2b28e51423e30d7449b6c7b5
 -R 70d28450bd13a75aeed954614a2f2b46
 -U drh
 -Z 2b960b7774bbbdaf4d5bf53bdfe32951
++P e0b7a191f3c22d9eacf645c58be59e0fdcb8860d c83052e48bbae0f45db2a44155b4e5482ee4a901
++R 82b5a61054e21833b8d835777835ac1a
 +U mistachkin
- Z 8dda7ece1b23ed740b28f121d2c5d713
++Z eb6e9bb0494d4ea430c53bed9c33a7ce

diff --cc manifest.uuid
index 19e522ec1e32c944990a6bcf9058d0400e28e61a,a3ebe5f013f468843f9f3746cbbe33e615ed1a35..74e4f4e1c01580390717f0b0eced8f407584dd5e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e0b7a191f3c22d9eacf645c58be59e0fdcb8860d
 -c83052e48bbae0f45db2a44155b4e5482ee4a901
++59d1a3bb6050a812c4eb0d25ac53327081b9efed

diff --cc src/insert.c
Simple merge