Merge latest trunk changes into this branch.

FossilOrigin-Name: 53cd91d00594f1bd7c0a565a35ec9cac3095a583022d6211158a369e942257b0

diff --cc manifest
index 300799b94de1834d5bd8273198c53ef9b0418cba,1ec49b32d9976a7487160461d231e7cdd0ee4af0..6c12470debe0f45caa5e08c9957fc9bfb2a95094
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\sminor\sissues\sin\sthe\schangesetfuzz\sprogram.
- D 2018-11-07T20:07:28.570
 -C Fix\sa\sproblem\swith\sthe\shandling\sof\sSQLITE_FCNTL_PRAGMA\sin\sthe\stest_onefile.c\ndemo.
 -D 2018-11-07T14:39:22.900
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2018-11-07T20:13:45.056
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in edbb6e20bb1decf65f6c64c9e61004a69bdf8afb39cdce5337c916b03dfcd1e3
 +F Makefile.in d298b31769d4c737887102462cd45684786b09f2a626a80b3e413790fb436219
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5402eae167757dae275cd99c21d21d77db2ec1877c58b4f790ef747a60b95c9f
 +F Makefile.msc 071853dfc2148aadaeb7a153b9986cc9d71b7f256874f79b119f97a4c89453f5
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 654da1d4053fb09ffc33a3910e6d427182a7dcdc67e934fa83de2849ac83fccb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1777,7 -1776,7 +1777,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 75b00fbe884d4bd8ba099d7c0a2e8af2f40fedfdef2d9b624dd51cb66952611c
- R 5fca9efd6de44ebb8f6fbca5a5730eba
 -P cbf85284beb60d068b446c52f000d694a810d4de9096ad2951523a4c88e7334c
 -R 088caf8858ff5594a1a4116e158cb2b6
++P 5c7f024073bc93089f038b5cf122a7a9d5b933f7c1b357f6d20ae925739ffc38 13e21b7da8fe754e230b09ca0b9f1f69cd9aa20d4407ddd8b95ca3fb18c9abeb
++R a7042ef684a713ebe1e2a0ddb4a19a3c
  U dan
- Z e2001bdcf73f96176b62c1ef68bcd666
 -Z 62eba71f05524b2e0125783d546c8de7
++Z 4f6b0c1caea94a39bd49cddc13a496f1

diff --cc manifest.uuid
index 4b02345530a84a1c16d7e3bf5ab370827d0a1352,f301856ba344080cbfe103aaeab13a0366261bb0..0ef83ca4e35bf805138c67f525a39d4127ab6b5c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5c7f024073bc93089f038b5cf122a7a9d5b933f7c1b357f6d20ae925739ffc38
 -13e21b7da8fe754e230b09ca0b9f1f69cd9aa20d4407ddd8b95ca3fb18c9abeb
++53cd91d00594f1bd7c0a565a35ec9cac3095a583022d6211158a369e942257b0