Merge the latest changes from trunk.

FossilOrigin-Name: 60105c2253d0b617037e975b0d0b729bcb59b950aa2c33d8891394ad45aabb69

diff --cc manifest
index 7926ed97494ef38fc68988f6cd0501b62292d7f5,e98acb5f54eb6cd21772aa34976bc83bcf4c8817..7ce1a7011886afe0d92e30affeec031709756c18
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sanother\slsmtest\sbuild\sproblem.\sAdd\sthe\s"-trans\sBOOLEAN"\soption\sto\s"lsmtest\nspeed2".
- D 2017-06-07T19:46:18.561
 -C Fix\sharmless\scompiler\swarnings\sin\sthe\sshell.c\sfile
 -D 2017-06-15T13:07:56.351
++C Merge\sthe\slatest\schanges\sfrom\strunk.
++D 2017-06-15T15:06:26.353
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@@ -1622,7 -1582,7 +1622,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 501238b9fbb4eece084b4bfce84a5f37a986f34db8081df517e60ef81f357454
- R 2f17872e101c8015a88bc34e46b72bd4
- U dan
- Z f9a3b900d1113fa410083f6360886457
 -P c7f778b7cee16a1dcebccd256408ee1d08ef2b62e388a9ebba5738a0a89bf3a0
 -R 2abdc374b32c7bda232d41622d54318f
++P 61853bc171e7c3af1db6a33ac8b1ad21e1c08e8d6b317fe061fdcd89c9a42e88 9afd7a2ffd3a39456190ad05e85ff6485298aae262d9e0698a58c1d73507a36f
++R 86dc51b3b4b5ca3aa4d0c441dc00d984
+ U drh
 -Z 65a79c7805978f50bb15716d0b6d13ff
++Z 8f32c68f28804c0ec498baf7082045dc

diff --cc manifest.uuid
index 9d32958b14615cfee7cb7716f062433ccbc946a2,9e0af2d15423840291645351408eaf921405ceca..28893f949895377a2034915c42271b5b3f0a449b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 61853bc171e7c3af1db6a33ac8b1ad21e1c08e8d6b317fe061fdcd89c9a42e88
 -9afd7a2ffd3a39456190ad05e85ff6485298aae262d9e0698a58c1d73507a36f
++60105c2253d0b617037e975b0d0b729bcb59b950aa2c33d8891394ad45aabb69