Merge fixes from trunk.

FossilOrigin-Name: ab1e58fac9e3f9d7d90cefb39f8f145d211d38ec0cb393208c4531cc646056c1

diff --cc manifest
index c01c4e39ca6f5c8f2de4e9459f3ae7b2f2b64248,c70fc83c3c772f8681fa54a19c5c3d2df547a626..033a02476a77261156d71572fa8268646d46f48f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\s--async\soption\sto\sthe\s".backup"\scommand\sin\sthe\sCLI.
- D 2018-12-08T01:09:14.691
 -C New\stest\scase\sfor\sticket\s[1d958d90596593a77420e59].
 -D 2018-12-09T18:55:05.721
++C Merge\sfixes\sfrom\strunk.
++D 2018-12-10T00:40:43.719
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@@ -1783,7 -1782,7 +1783,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 af172b53b46759f491f522356e14c5e2374d3f25ec70fbc1e100cadded8f9b22
- R df568823aa698ca1a561c86a7815b31b
 -P 15bc915dd7ae25bfdfbe357c3792db3639799e4d121c6b5b24297af2d6d7129e
 -R c0db1af5f2bfbd2fba4377002cf1535d
++P 7b6a605b1883dfcbe237b0a58f6f0c233a109e88b521c3b3d97198526c8a0317 b7bf3c9832bde26b359f4d58ebcf7788c500586d311387d022192ed65a126252
++R 9c5048fab1535ae69a9ca5a527426080
  U drh
- Z 361de2f1352642d2a8077d8c1209b182
 -Z e19bb708feb379cc8644d3f55b45ddb6
++Z 4be57a3eceec619de5e7431288dd440b

diff --cc manifest.uuid
index d46907ba61be5697292a8e80f920406fe87226b2,1e7c3a3d088853e97b223f3e31e739eda8bc6462..9ce083fd0082473350073e0df6f966404f355931
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7b6a605b1883dfcbe237b0a58f6f0c233a109e88b521c3b3d97198526c8a0317
 -b7bf3c9832bde26b359f4d58ebcf7788c500586d311387d022192ed65a126252
++ab1e58fac9e3f9d7d90cefb39f8f145d211d38ec0cb393208c4531cc646056c1