Merge fixes from trunk.

FossilOrigin-Name: 9c8255a199d6544b02302bfe3ecd253098821170646a509d2e3dc6cf4e43289b

diff --cc manifest
index c45274c15360f289da7abbe196e92ced47b6c8b6,7e0c43b42e5d889110402ee5ca5fc40e44f206d1..178bd2862bc5b7a73a40fe94b9540ec737a34705
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2018-10-08T18:58:51.339
 -C Fix\san\sissue\swith\sthe\snew\smemstat.c\sextension.
 -D 2018-10-08T20:04:16.861
++C Merge\sfixes\sfrom\strunk.
++D 2018-10-08T20:37:21.400
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@@ -1772,7 -1771,7 +1772,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 a625698048c05375f12ea8875892fdbf3518291f10917fe68dd2294280cd3b42 690dd18a5768c5a8cdfa92d5b01901c1a7b1fb6ebb90399f56a3112e41609f92
- R fe6beb8363bb52b29ad9017127c5a25d
- U dan
- Z 3140f4ddf8569ce4edd6a8cc2929ebcb
 -P 075066944b13b18d339ccf87ae16f0b91bf00f40bd70f71c6beba6aa6c43f0b6
 -R 951b54fa62380919f60e6beeacdd92a7
++P 2ac72114a1f5344b42472b941c60f460c28c981a22ea40909b30f7bf4eb4b11b ce6e80b1303ed161bec2c63735cd2e2bea7b4e9b4ff780d214d408b1a30d50da
++R 846d7eacf6e28e6dd5fb8a67e6823a09
+ U drh
 -Z c2cad3bd34a2756d8af9a8d60cc5c6a7
++Z 1449cec431dc347fd65f177d81002172

diff --cc manifest.uuid
index da2645ce6e4ed7ee696f9a27b965fa6adf4cc887,b2487e39df82c061471a4df65c67ced5081ef72e..118a2f051d055f31a2b86ec6059bdc1da3c85864
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2ac72114a1f5344b42472b941c60f460c28c981a22ea40909b30f7bf4eb4b11b
 -ce6e80b1303ed161bec2c63735cd2e2bea7b4e9b4ff780d214d408b1a30d50da
++9c8255a199d6544b02302bfe3ecd253098821170646a509d2e3dc6cf4e43289b