Merge further trunk changes.

FossilOrigin-Name: c2327a3b8e5d604ab948b1e9f6cfc401429e51db

diff --cc manifest
index ccebc082883e639f5de2944c46cb041298d43e7f,de7c994cbe781af4a2d1250f8d0b01458cf2a2f4..6840db861cb6abaac9d094345d03e678b51220a5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\strunk\schanges\sinto\sthis\sbranch.
- D 2015-08-22T07:55:08.264
 -C Fix\sa\scouple\sinstances\sof\sOOM\shandling\sin\sthe\sjson\sextension.
 -D 2015-08-22T03:05:54.585
++C Merge\sfurther\strunk\schanges.
++D 2015-08-22T07:56:49.673
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 4f663b6b4954b9b1eb0e6f08387688a93b57542d
+ F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc cf63e11a5395cf887515ac7b78e2057dfe442fcd
+ F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -1378,7 -1378,7 +1380,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 53aaeea6c98f82f3b55d4b3ab139ee41b727243c da3c9df09c46564353218d0163e378b880a3ce62
- R 116680cc2378bd296eca514a508d2e03
 -P 351bc22fa9b5a2e50da3583a882c5aa390bda19f
 -R ca8b5b15c77432f02507718e8d7e076f
 -U drh
 -Z d373dd42adbb610fe45611bf2ca7212e
++P 9021f7369f4b32db6126b3dc0ac75d11039625be 213a6c5ccbcfe4495d45e3608e99a6398751aeed
++R d0dd8783a44e8da0a2326d10e188c817
 +U dan
- Z 84908ef388a25122ca565349eedf9c7b
++Z dd4c495d35a4ec7386b2f6d290b0dddd

diff --cc manifest.uuid
index 74c876ab45abfc00b03dcae0eeb04aa08310da1e,4064ce58f6f607e338071b671c4a1d29c938787f..4a13cf0ec435cfe8650346b67919e984cd7e7e2e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9021f7369f4b32db6126b3dc0ac75d11039625be
 -213a6c5ccbcfe4495d45e3608e99a6398751aeed
++c2327a3b8e5d604ab948b1e9f6cfc401429e51db