Merge latest trunk changes with this branch.

FossilOrigin-Name: 585e0a09c5e1cd3d32e7b3fe228bd3eb674631f4074f517aad4c2600818a337a

diff --cc manifest
index aaea49591fb05dacb98a26fea1dd69f80799f336,a447c36649c46e5ba238bd07110b8d3f147ce2c4..ef298569fa2cded16b62cc4f5e73dc46be0b7621
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Allow\sreadonly_shm\sconnections\sto\saccess\sthe\s*-shm\sfile\susing\sread()\seven\sif\nit\sis\sunable\sto\stake\sa\sDMS\slock.
- D 2017-11-03T17:17:44.636
- F Makefile.in 5bae3f2f3d42f2ad52b141562d74872c97ac0fca6c54953c91bb150a0e6427a8
 -C The\sextensions\sfunctions\sin\sspellfix\sare\sall\sdeterministic.
 -D 2017-11-03T08:46:48.968
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2017-11-03T17:51:37.040
+ F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 3a5cb477ec3ce5274663b693164e349db63348667cd45bad78cc13d580b691e2
+ F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
  F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1668,7 -1673,7 +1674,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 f569c3517234881f9425075aab65a32ffd0deb8e793f421a241d8cca881da33f
- R 20903fe541f5da42c2200a9eba3c1e5d
 -P d088c5a3f1a803118cb67560fc35c11178e1b7e54c0e1511677559906b9da980
 -R b7838526febd368042ba32a4576c580c
 -U drh
 -Z 18ebbc1917110c35a4b2606f5ce6f533
++P 9b0d5c4ff707f58b07ae28cfe0a7de62fbd22fa20678e446350d1472391bc0b9 29ec855e13e0dcd675dcf12948b42f9e669d0a31c5d9efb95857888aba0beeee
++R 04d6fa7835319401e085a65123a1b583
 +U dan
- Z 111bc60b3d02df6a9da28fff434dc070
++Z 9bd997c1b71c6c7594ae27b51b9c96d2

diff --cc manifest.uuid
index 910f081e0e97d11e61009f6383370ebb85a0dfea,5035b0e5a77256ed94093692ed5e1b785021eff7..8e06905bef153a973c3c47b90309319a8c52e491
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9b0d5c4ff707f58b07ae28cfe0a7de62fbd22fa20678e446350d1472391bc0b9
 -29ec855e13e0dcd675dcf12948b42f9e669d0a31c5d9efb95857888aba0beeee
++585e0a09c5e1cd3d32e7b3fe228bd3eb674631f4074f517aad4c2600818a337a