Merge updates from trunk.

FossilOrigin-Name: 5f7fc79aa06ca9b79664c50c3c277c98a74ff9a0

diff --cc manifest
index fb60f9c239d80c379c4999d8a3c7ebf2da10d80c,084b50ff08baccd807645462babeb1d80fbdec88..3143c0ded64532fe2640ae79aad13fcf32094f65
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\san\soptional\sbitmask\sof\sallowed\soptimizations\son\sthe\s"PRAGMA\soptimize"\ncommand.\s\sThe\s0x01\sbit\sis\sDebug\sMode.
- D 2017-03-02T14:17:21.291
 -C If\sa\sreprepare\sis\sneeded\safter\sbinding\sto\sa\svariable\swith\sa\snumber\slarger\nthan\s32,\sset\sonly\sthe\shigh-order\sbit\sof\sthe\sVdbe.expmask\srather\sthan\ssetting\nall\sbits.\s\sThis\scould\spotentially\sresult\sin\sfewer\sfalse-positive\sreprepares.
 -D 2017-03-03T21:51:40.099
++C Merge\supdates\sfrom\strunk.
++D 2017-03-06T11:39:34.004
  F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
@@@ -339,10 -340,10 +340,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 83e2bc48be6e09eb88e312eb791f4bbd96986d93
 -F src/btree.c 91baade79832becb44d85cd7c39b5ebe170666d8
 -F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
++F src/btree.c e2bae0a03f73d119910fb35c9550987564065137
 +F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
  F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
 -F src/build.c 51b473eec465f471d607b54e8dbc00751c3f8a1f
 +F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
@@@ -463,11 -464,11 +464,11 @@@ F src/update.c 456d4a4656f8a03c2abc88a5
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
  F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c 83f387d9e6842b1dc99f6e85bb577c5bbc4e397d
 +F src/vdbe.c f520378e510fd36bbf289921798dbc8f2b3dc30d
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
- F src/vdbeapi.c 70aabe108c411e529a59d8800445513965334062
- F src/vdbeaux.c b632f9151a296c5eb22a2cc955c487ebc2347cb6
+ F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
+ F src/vdbeaux.c 57361f2e761d92a254638bdbfc03fc68ae6aebc6
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
@@@ -1560,7 -1561,7 +1562,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 c60cdb47612c05c252613e50a8ac10635469fdfe
- R dbee345c7724a1e9049a9032bbb0a60b
 -P 4a04c48a311b19ba5e566877dc5baff543c41aba
 -R 637ce5713001d3d9ffad62c9c4caff88
++P a35388eef4096c1856b025dbd90143409d4a72d3 45797feefe90cb7da53256b0c42fdaa1221d0a27
++R d076238fa06701bd917c02e95912d525
  U drh
- Z f9893159b19aa2a55c1ddc2fbced30b3
 -Z 435b5c3ba7edfd2dba5c4b61417da7dd
++Z 38cdac8e2d46c01757b80b6fff7491bd

diff --cc manifest.uuid
index 33843811468f5617a6a9d46e170b3cd247ea2b0c,9ee7804d6187c3c41567c0206a1a180c09389496..1bffbf3076040f8f6075d1237b3d85b935a82e7d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a35388eef4096c1856b025dbd90143409d4a72d3
 -45797feefe90cb7da53256b0c42fdaa1221d0a27
++5f7fc79aa06ca9b79664c50c3c277c98a74ff9a0

diff --cc src/btree.c
Simple merge