Merge latest trunk changes into this branch.

FossilOrigin-Name: 8a28a326d7f72ab94c7d089dbc047e719038b6cd410068dec0d173a7655c87ca

diff --cc manifest
index 1077cc593fd6f9929938fc8ad0d0613748471072,41af087d80d8548a3ea0869d135457a351b24a9f..3c2192a6789def6b5d3e84ae2dd75dd54b137474
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Ensure\sthat\sthe\stbl_name\scolumn\sin\sthe\ssqlite_temp_master\stable\sis\supdated\ncorrectly\sas\spart\sof\sa\sRENAME\sTABLE\soperation.
- D 2018-09-06T16:01:37.037
 -C Add\sthe\srandomshape.tcl\stest-case\sgenerator\sscript\sto\sthe\sutil\ssubdirectory\nof\sthe\srtree\sextension.
 -D 2018-09-06T14:01:56.119
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2018-09-06T16:17:22.185
  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 -1759,7 +1763,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 6f4f707f9c3c29f2437962fd5d7761876cf8e7ed7fdcb9d0ca4fd001fa226597
- R 736eb84ee6a36063403800095e80dcb4
 -P 9057e27e12ded07a9ea0b2868036d3019f7bc5be3a67e3d341f56b762d3de9d9
 -R 3130dca95e718b6cbbaac719dc665d6a
 -U drh
 -Z 0d8f7c300159980e6dfc3b9bdb17b906
++P ffecfca511718e39e0003b380d5113755b8a11405a5bd80cc04503d9557f0842 8f48991dcbb01e21d065fbba7782a6d1aebaa8065841a70a76af1e5a21f18ea4
++R 2f5689c57a4e86b56b7049238d0df17b
 +U dan
- Z 8b3bb9ab09ae82a5dd16cca46750c9c8
++Z 23222d1f9d48d6fc98b8f4b6620787f5

diff --cc manifest.uuid
index 0f536b66a53c4ed9df3a826d030e257fef976b6a,742e85ee373850d4a7dd84fff194fbc3f0d1b3f4..b642dd53a830cec0b05b8801dc1dc0a26ff4df6a
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ffecfca511718e39e0003b380d5113755b8a11405a5bd80cc04503d9557f0842
 -8f48991dcbb01e21d065fbba7782a6d1aebaa8065841a70a76af1e5a21f18ea4
++8a28a326d7f72ab94c7d089dbc047e719038b6cd410068dec0d173a7655c87ca