Merge enhancements from trunk.

FossilOrigin-Name: 9650f71b82ca1b3759e776bbd8a2e8ca61c51f80038e37c9c9a675a8c13b0b06

diff --cc manifest
index 481534c3588cf4f7bc61d3b8a9239c38f2565acf,bbf755934873e2483236244aa678be09c89494e9..a19a336799715ec6d2142a1f3f037eee0ca9443e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\svarious\serror\shandling\sconditions\son\sthe\scell\soverwrite\soptimization.\nFix\sa\stest\scase\sso\sthat\sit\sworks\swith\sthe\snew\soptimization.
- D 2018-05-03T16:56:06.556
 -C Fix\srequirements\smarks.\s\sNo\scode\schanges.
 -D 2018-05-04T18:32:11.376
++C Merge\senhancements\sfrom\strunk.
++D 2018-05-04T19:18:27.186
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@@ -1727,7 -1727,7 +1727,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 54c537eead5b08104cfaf0d5b1e2706e53d6f74be2ca02e06229024fd889fc94
- R e3474d8063bbcdfd90a9f2049be513c8
 -P 03edecaf9dcfc927aa60c2a17590a432b17de1647d480d277b4aafc8018c2d20
 -R 4f52e7dcc458ba7f262595157e6a17d1
++P f89b54f41405ed7e28132f66b8a0c690a087c2412c8f55790c2beabb0b521645 7fdad122a21e4b01bd678198fd5131dc32febe3af366bd6368505398255f9822
++R df1e682f55c594c022a81ad6cca73208
  U drh
- Z a88b0406803dcfd2b3d768953d03cd3c
 -Z 0166ce191b6e6f7de3de6a7872e950dc
++Z 23057790a24d7f2fdd5e77d4df41fcee

diff --cc manifest.uuid
index 2ad022bdcb41d45e207682de394e0750c51bcfda,08c40ca52710d06612ab7ff08484ac20713f8b12..da787b296240fbb1626123f2cc605558a3afdd60
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f89b54f41405ed7e28132f66b8a0c690a087c2412c8f55790c2beabb0b521645
 -7fdad122a21e4b01bd678198fd5131dc32febe3af366bd6368505398255f9822
++9650f71b82ca1b3759e776bbd8a2e8ca61c51f80038e37c9c9a675a8c13b0b06