Merge latest trunk changes with this branch.

FossilOrigin-Name: d218d815f89cb1368fdb5e3f774b7adaaf02560a367ba0f3e54987e08dd6241a

diff --cc manifest
index 0f5352281d2af05d1675cebfcdfc235a4c8d5a38,859cd710c0a53e7a224b814aecfe6e2b3df002ba..8bc427df4993c1756888f0c1403d3f283578c27a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sa\sheader\scomment\sto\swal.c\sdescribing\sthe\sdifferences\sbetween\swal\sand\swal2\nmode.
- D 2017-10-09T19:49:08.605
 -C Fix\sharmless\scompiler\swarnings\sin\sFTS5\sseen\swith\sMSVC.
 -D 2017-10-08T02:22:06.059
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2017-10-09T19:50:09.728
  F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@@ -1657,7 -1656,7 +1658,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 f7360fad51f224f347bb7d263eb89056b27461c278309e00e575a0e8898c9f40
- R 3eebf17818b82033242954f80ad24b93
 -P 39d920d1ef0cce40195b21e148f78f544710348fa180c0e76f743a73e5236d45
 -R f768d25ae3366d16350abf238bbc60dc
 -U mistachkin
 -Z 0e12f4ab1427b4952396ef9a1f9de008
++P 9c80cd202f1c966929b279e18f19c663912686fcf92f03b85a02b9c7e55a0fc6 5594a121bf132a98d0ecb4cf86d9f2681925c9416206096bf11c9370a5dae22f
++R 23a883a99c179b06ab669012d3314db6
 +U dan
- Z fe65619fadae77c6923d24a16aa4aa37
++Z c8f907ef387c1600d03d31327cf9ed02

diff --cc manifest.uuid
index f96be1474c59d9339cef664f841b2d46b456b51b,add2ac521cee54f5c66d70bebe754974e64b30cf..7c4ede0c0c897ce9fd059694cc7f39b16a687046
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9c80cd202f1c966929b279e18f19c663912686fcf92f03b85a02b9c7e55a0fc6
 -5594a121bf132a98d0ecb4cf86d9f2681925c9416206096bf11c9370a5dae22f
++d218d815f89cb1368fdb5e3f774b7adaaf02560a367ba0f3e54987e08dd6241a