Merge changes from trunk.

FossilOrigin-Name: 715740e3025f7575c1dc7cf220da6bf899d1e1b565eecbc38d2e9ec406fc97b8

diff --cc manifest
index 40e107acb41070ab4fe7c4115d226c6e5628eaf5,bd01e305f61f0a84224689e57589b2d63e070536..ccef0e7698356b622f866bd9a623e7fae20894e7
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Resolve\sissues\swith\sfloating-point\sround-off\serror\sin\sthe\sgeopoly_overlap()\nroutine.
- D 2018-05-12T23:31:55.012
 -C In\sthe\sCLI,\sallow\scomment\slines\sthat\sbegin\swith\s'#',\sbut\sonly\sin\sa\scontext\nwhere\sa\sdot-command\sis\sallowed.\s\sIn\sother\swords,\s'#'\sat\sthe\sbeginning\sof\sa\nline\sin\sthe\smiddle\sof\san\sSQL\sstatement\sis\sjust\spart\sof\sthe\sSQL.
 -D 2018-05-12T23:56:22.493
++C Merge\schanges\sfrom\strunk.
++D 2018-05-12T23:56:48.444
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1729,7 -1728,7 +1729,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 318ba5f0c52596fc5ceed23a2b7b1ca18644449809890bfed47ab4ee01075060
- R 1da7cb9cf65004180c616e72e6f418ab
 -P 13e7300a37e379eac564594d78d3f039fd25737493b3b627ef02fab57a6c98e1
 -R 6b32792e712eff37702825b507b2e9b6
++P a3c6696f2f39554e968dcd86c87296b0d54e5a1683c2b309071ca70e7631b178 4ee136d6d2e029dad8371faf659d3a0bc0ac6ae76940db81d333848545bc990f
++R b2d69017114a5dc9f75f317c090f3551
  U drh
- Z d3afa3a25b44d630c4f3a8b5d634f737
 -Z d7c29ce2018cfc34028d7ed7f7fd8bc3
++Z f9f5f92a768d6e4f444355f2648a08cf

diff --cc manifest.uuid
index 6494c9c2b2f6aed1b929ed4cc4ee6d9759ed2ffc,fa85b0e1dd7fe563f9ced37bd002588dd1a6af5c..b2db1dddf6be6731548a4c7128d5630299a9d2a8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a3c6696f2f39554e968dcd86c87296b0d54e5a1683c2b309071ca70e7631b178
 -4ee136d6d2e029dad8371faf659d3a0bc0ac6ae76940db81d333848545bc990f
++715740e3025f7575c1dc7cf220da6bf899d1e1b565eecbc38d2e9ec406fc97b8