Merge updates from trunk.

FossilOrigin-Name: 71ffa195f5a48280ee522d80ab82e8cdea636961

diff --cc manifest
index 02ee3f6e4681467d642648914275377c98c8133a,fdc9dbc32a8d9c5ccb73c5dfd5b6fa1d0ed416ab..4e1dbf38c0e0b71788fce86b6b3bc15592deb74e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Update\sthe\sautoconf\smakefile\sfor\sMSVC.
- D 2016-07-29T01:46:57.427
 -C Undo\ssome\sunhelpful\schanges\sto\sskip-scan\sscoring\sthat\swere\sadded\nby\sthe\scheck-in\s[9e2b2681]\sthat\simproved\sscoring\sof\sindex\sscan.
 -D 2016-07-29T01:32:36.387
++C Merge\supdates\sfrom\strunk.
++D 2016-07-29T01:47:18.951
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc eefec7a26bf73bb04f2241058e23a3ec8a43f656
 +F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1508,7 -1508,7 +1508,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 bc8c9b55ddf5227dc6b2116486f4a19bf54fce2b
- R 81c2da6dd9132e2ceb1da7d33d25fdb6
 -P cbe1de4799df4d512bc175f51ed99c6ec6d5a4d1
 -R 69cbd4ac65697876502fdf627dd430d9
 -U drh
 -Z b3c6b81889b1e6498dbf215474f399c6
++P 2daf20980d4cb9ed36372778ae1f3e595e503549 c7d51934a4f30d096bb79fc509fc9dd0df5d89a4
++R 092b06ead5aa5690fab5536515621278
 +U mistachkin
- Z 72b9cccf5e1018e731ec3108866ee753
++Z 23d60fc77b6ae6b4289b40af8949150e

diff --cc manifest.uuid
index b2d11c5e33baf0454f9136c5f05e662d11c7630d,e200b2ca41b87e6d6af84ce0524ed2833e40ca1a..ee46095cc0d1434f8505dbccd97c2f4e62ecfc43
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2daf20980d4cb9ed36372778ae1f3e595e503549
 -c7d51934a4f30d096bb79fc509fc9dd0df5d89a4
++71ffa195f5a48280ee522d80ab82e8cdea636961