Merge latest trunk changes into this branch.

FossilOrigin-Name: 6f4f707f9c3c29f2437962fd5d7761876cf8e7ed7fdcb9d0ca4fd001fa226597

diff --cc manifest
index e8a3770499635637bf4823e30318cd949eb6f63c,23795573778e3566c9b1aab3212756f453bb3c4f..7161489fe6c8e711dcf8a54e3cca361b400a6b24
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\ssome\stest\sscript\serrors.\sAnd\san\sincorrect\sassert()\sin\sfts5.
- D 2018-09-05T17:45:17.915
 -C Remove\san\sold\stestcase()\smacro\sthat\sis\sno\slonger\svalid.
 -D 2018-09-05T16:16:56.322
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2018-09-05T17:52:52.364
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in d06f463c5b623a61ac27f5cb8214fca9e53a6704d34d6b8f2124e2b1b293c88f
 +F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc ab99b4a0aa33f1c0f39587be9df15c9db536acf7859828ff8c51e13eb5082874
 +F Makefile.msc d37bb24f0910744b555d77bea3d2f31e412caaf0c8ac6ec76a3d312cb3cf52ce
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1762,7 -1758,7 +1762,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 2ec7e50cbc0e7a4308d51be3c9416229b187a6a8abdd982c154edc256cd6da1f
 -P f1138a38bd23f201a35621a71e82c5718abddb42ab82938e9516ab9d43e4df16
 -R 8c1ec812a21bef0e00fe7356d77c5582
 -U drh
 -Z 9e5b746cf326cab70da9649d19c0539d
++P f804336f083d8d26314bb1ba34cec427675065a67cbe2bf00bb42e40752aeb33 e628713338f6e584a32d5fc3436ddbd9ee8cf88401c321c1ebe7daa1e695c623
 +R 41880ac914b2711bb962960eaec2ca98
 +U dan
- Z 5d7db0d8762bfd1edeb797d19c90dbc2
++Z 12f9217db838b96229534e48a6d1f751

diff --cc manifest.uuid
index 786d6757be46028bef1795fb058d3c8a07d03fda,836d1b7a9f2c8cbab0227669b576ccdb89a25851..1850eb663caaa688724529411c7a84c533ca6f9d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f804336f083d8d26314bb1ba34cec427675065a67cbe2bf00bb42e40752aeb33
 -e628713338f6e584a32d5fc3436ddbd9ee8cf88401c321c1ebe7daa1e695c623
++6f4f707f9c3c29f2437962fd5d7761876cf8e7ed7fdcb9d0ca4fd001fa226597