Merge trunk changes.

FossilOrigin-Name: 047295c588e9fdf2ffa4e69e166f177fd193309531dc6a9ac755fb7a763adb72

diff --cc manifest
index 4662b7c5c6e3fb37e280e677637d89d784c4f5a6,66e6ec828de050bfb327f25b865a5b08758b48a8..d53a07ddcfc95f88f9b3d38a71d31ef94276878b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\schanges\sfrom\strunk.
- D 2018-06-04T13:27:39.306
 -C Update\sand\scorrect\sthe\sdocumentation\son\sthe\sOP_OpenRead,\sOP_OpenWrite,\nand\sOP_ReopenIdx\sopcodes.\s\sNo\scode\schanges\sother\sthan\sthe\saddition\sof\nan\sassert().
 -D 2018-06-05T13:43:02.599
++C Merge\strunk\schanges.
++D 2018-06-05T13:54:06.962
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@@ -1730,7 -1730,7 +1730,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 92f0fe155d5546fc7f4a443d0630613dabe149061966308e5420fad652278f16 1ecb3aa13de5c8dc611b814ff34010de0bd90aae73d88aa37a59c4627be4cc2d
- R de1a7f465f15f36752abec96be3aea43
 -P c7ee0833225bfd8c5ec2f9bf62b97c4e04d03bd9566366d5221ac8fb199a87ca
 -R 0277d841a9ebaf3476d82cef8e2d4609
++P f8df2a8e28acdd9573a9ffc18027553f35f769a989f5dfbf81f31b0656ee6065 8a0b730d0ea640d5cf75febe39b2162411a12eb5275765a85882158b5a085681
++R c016cdaa4deeb52d3fb41752c4ee7460
  U drh
- Z fcbdf6ace3bba503012881319d44d7a3
 -Z a41043871845bbfbe4b1d10a98baf884
++Z 7399c1ded5e7ae5c45a8362a80c02d78

diff --cc manifest.uuid
index f200fefdac9528bef9e1466794140592dd4e5163,d25ed674b30352c6b21974bce2fa80c5013965e0..d74be7579c3ea6f24b575b0d94e1701cc71fc0c4
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f8df2a8e28acdd9573a9ffc18027553f35f769a989f5dfbf81f31b0656ee6065
 -8a0b730d0ea640d5cf75febe39b2162411a12eb5275765a85882158b5a085681
++047295c588e9fdf2ffa4e69e166f177fd193309531dc6a9ac755fb7a763adb72