Merge updates from trunk.

FossilOrigin-Name: 0a75ebd23e3bd56d9352549bfb9f97f24e29e0cb

diff --cc manifest
index f361f6da16e41157f6128567c8c3e3dc45fb353e,a5c55554866f1a4fd7489ef815a11dfbfc293d2e..a044c1cae96e5e8f9a42545146d9213540238d55
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Remove\sa\scomment\sthat\sis\sno\slonger\saccurate.
- D 2015-09-14T22:54:52.967
 -C Capture\sAFL-generated\sfuzz\stests\sfor\sjson1.c\sinto\sthe\stest/fuzzdata4.db\sfile.
 -D 2015-09-23T11:59:50.725
++C Merge\supdates\sfrom\strunk.
++D 2015-09-23T16:35:52.480
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
+ F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
+ F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -1387,7 -1388,7 +1388,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 25c157714dc1e89988543d9b7df6b1791911e8a1
- R 28a9cf9a9f41f43274194ec4eaf211e0
 -P 7c7a3f3e9bc2f7a7334d8d6eae183d83f22097be
 -R 64646de8f025fcbfbac14050e58f6d8a
 -U drh
 -Z 8d3625ca1ecc6df3eff60cf48fea0eb8
++P cf114c18953044bd50c050c662cef256fddcef9c 10a214fdb3c13b25e0bdd15c975c21c8890c47ee
++R 3d77c66da90a872536f41067a31e97d4
 +U mistachkin
- Z fe0396cbf97fccdad9b70f17864f9d97
++Z cdaa94bce4ad170f086743df139fea2f

diff --cc manifest.uuid
index 63f50457b7484031510a1754ce8dece596bd9739,5e8156b16ca730636a94c37d9fa874ec9b0fd272..27bec6567893c5c71c59c1969ea61b10473efb16
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- cf114c18953044bd50c050c662cef256fddcef9c
 -10a214fdb3c13b25e0bdd15c975c21c8890c47ee
++0a75ebd23e3bd56d9352549bfb9f97f24e29e0cb