Merge latest trunk changes into this branch.

FossilOrigin-Name: ef9e088290efa9d0fc36bcdef710cadfef37c8a33f4685dad4ce113807e1cc75

diff --cc manifest
index 47cc2e04b0e0385e87ebdc41040e02c646ba6890,3dc67aca1ad4c328b2c5d544db6179e29e188739..0a360075903b4b99c08d6e6c1f4ae358cbc587d3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Improve\sthe\serror\smessages\semitted\sby\sRENAME\sTABLE.
- D 2018-09-03T20:05:15.294
 -C Ensure\sthat\sFTS5\squeries\sof\sthe\sform\s"WHERE\srowid\sBETWEEN\s?\sAND\s?\sAND\stbl\nMATCH\s?\sORDER\sBY\srank"\sdo\srowid\sfiltering\sbefore\ssorting.
 -D 2018-09-03T17:11:11.873
++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
++D 2018-09-04T18:23:59.058
  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 828e8849faed85812c03215b00a2ba34cbb00dfa4d4afdcbd11300ba7fcf9743
- R 449b06d6ad0445dae4839b47d935273b
 -P c1aca7673ab04740bc8ad76af0a72a229c79a0cd51cf84d1c689a77424ff17c6
 -R c94df3a0d438cb673167739b2da5cf87
++P 6805b5900df5e6d3329cbad2660875ebe4069efe37b19575f527d153dc0882a1 f1138a38bd23f201a35621a71e82c5718abddb42ab82938e9516ab9d43e4df16
++R e8730623bb58ce7069d342aaf0307c8b
  U dan
- Z 4bd06618a9b82e1d30214a9078fefd40
 -Z b61c96101775cc20ac78991005fa78af
++Z 2ab7bdc7b709a6325ea8ef14f7ff4ef1

diff --cc manifest.uuid
index 7e8f9b0b43cac4057e19aa426f860b7fee9bad30,965f8873959f79b02a209d71c8df0ccdd311ee09..b14419725daba06836cd46c243a2d28c9947cbac
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6805b5900df5e6d3329cbad2660875ebe4069efe37b19575f527d153dc0882a1
 -f1138a38bd23f201a35621a71e82c5718abddb42ab82938e9516ab9d43e4df16
++ef9e088290efa9d0fc36bcdef710cadfef37c8a33f4685dad4ce113807e1cc75