Update this branch with latest changes from trunk.

FossilOrigin-Name: 5fcd840cf9b6a5c3ee4ef1e8f92f6c30f96a7899a3d774ee9be8a816916f2c3b

diff --cc manifest
index 93467dde3cadbc236c424e555a3404372d7a5c3c,732075dd2ad70502efff188c181127541983287b..44bc9ecdb4f0fda800541594e33e97bf514270e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\s\sbranch\swith\slatest\strunk\schanges.
- D 2017-04-11T19:00:30.300
 -C Reinstate\sthe\sSQLITE_API\squalifier\son\sthe\ssqlite3_delete_database()\smethod\sin\ntest_delete.c.\sAccidentally\sremoved\sby\sthe\sprevious\scommit.
 -D 2017-04-13T15:51:27.697
++C Update\sthis\sbranch\swith\slatest\schanges\sfrom\strunk.
++D 2017-04-13T16:19:40.114
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
@@@ -1578,7 -1571,7 +1578,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 cc8c3581060ffef02290b680183e6f6bc9837ba3550e74c8aaabdc7c45edc223 76cd611d41465fcec61c21520d55172cb236530f38386b7d4a5544ba87de2353
- R 598dc6bf3b8d38f8068b443f6c7f3624
 -P fa9bb7b768027677f7e7d5a196ba5b245dfc8d8986ccd101c8dab671bd15719d
 -R a3ef8c76f5c2f7b3a154992d233a97da
++P 0f66a093935100efd731e14aa63b57360ddd517c1ac97edd1ea9a9de95e1f3cc 59c70108fd179932ccdd860f93e1cd68b77476d3b1af1af00cf6e378c9984862
++R 67cf9bfa549dda32e4c23afbb89f9c17
  U dan
- Z 7c38a019370c850a76053a951a01d320
 -Z d716c1706cce68fcc2a1217c8e02d65a
++Z 6319da725d84003b27573110707fc385

diff --cc manifest.uuid
index a77280eebce4fd449446ca631a16750672e5d83e,a5dc30585ac912801fd6a7339e8856099af1b769..123a103b0727d5dba06936f34862bf5fb3485534
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0f66a093935100efd731e14aa63b57360ddd517c1ac97edd1ea9a9de95e1f3cc
 -59c70108fd179932ccdd860f93e1cd68b77476d3b1af1af00cf6e378c9984862
++5fcd840cf9b6a5c3ee4ef1e8f92f6c30f96a7899a3d774ee9be8a816916f2c3b