Merge trunk changes with this branch.

FossilOrigin-Name: 876810c28b3ad573ae46050ec699ef7eea4e313d

diff --cc manifest
index 1285f64e7633319e91b22de37f29c1bc90f283f4,86f1a81da0f67deebdbec440283605706a4c1cc5..06617c4d57577d55d8b80f9c12d7c8ca97f4b6e5
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sanother\sproblem\sinvolving\sunlocked\stransactions\sand\swal-file\srestarts.
- D 2015-08-24T06:43:25.273
 -C Fix\scorner-case\sproblems\sin\sthe\stype\sand\satom\scolumns\sof\sjson_each()\sand\njson_tree().
 -D 2015-08-24T02:32:04.608
++C Merge\strunk\schanges\swith\sthis\sbranch.
++D 2015-08-24T06:44:17.840
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1381,7 -1378,7 +1381,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 e3968b256282d8c0a87c26667b1ba02faf7a5a17
- R 616e25ded22fb9d47c944cb40768f03a
 -P 518d6220a12fb1289f699ef0821e6adfcd286ed0
 -R d6c92e3d9acd1a46fd49a9ba005fd842
 -U drh
 -Z 8270e043900b276b537309af17df590f
++P 4460764ea8fc948fe02f0a09476857839b3aa1ae f0aba0e120074430cd7ad93291fcc97b8a25a054
++R c9a4c2c74a91d952dffb223e6caf31f7
 +U dan
- Z 4efd00eba0478d425d47255076a7c364
++Z 9a4849fb712895f27dbf139db01b2763

diff --cc manifest.uuid
index 75583c940a66bb8e89cbdd39a48ad22303e36f90,f0c18aac37ae455d514a3852aa611d81d5a6ef38..9e718e4bc395630acaea5b098f2df326bb0dd254
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4460764ea8fc948fe02f0a09476857839b3aa1ae
 -f0aba0e120074430cd7ad93291fcc97b8a25a054
++876810c28b3ad573ae46050ec699ef7eea4e313d