Merge updates from trunk.

FossilOrigin-Name: 10ee36d012e6ee82febbe0ef2e90381e215afb90

diff --cc manifest
index da6378b74824d7646eb0203c6c3428795cec0ee0,0c5a5294e3b04b9bc7259cf3c60a13ee83cb8756..b4c49bdf3e03e5b6f94c8c4a723a21eb619939a8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Use\sthe\sdatabase\smutex\swhere\sapplicable.
- D 2015-05-12T23:33:32.287
 -C Enhancements\sto\sthe\sMSVC\smakefile.
 -D 2015-05-13T04:50:30.732
++C Merge\supdates\sfrom\strunk.
++D 2015-05-13T04:52:26.726
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1258,7 -1258,7 +1258,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P e908365faea6987f98dc3954b932f9a353241bfc
- R e9c28482805eb7c4ec3e21f0c39ac069
 -P b33f1bacfdb34fe66b7b073e68bfac38498d6e88
 -R 786cf9bafb843a30daaea508385a36b1
++P 28cfdabc471e132a856292781767777c6390ea3c 59e3e9e764440b7feaafadff74f422535d21bca2
++R 6d9983e3c63d923bd10dfd89492e7521
  U mistachkin
- Z efab135419f44db544c50d8003598130
 -Z cf0d8cd171ac487c0fd87c289759c254
++Z c62be7c9e3b3706985519faa753e0586

diff --cc manifest.uuid
index e3656c30bdcf0770fca8d20b80857a5927e4b080,af09740391caad5f8097efb6a468eab85473077d..7e649d8eaba8afca61c878b6d3e21c549b02d157
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 28cfdabc471e132a856292781767777c6390ea3c
 -59e3e9e764440b7feaafadff74f422535d21bca2
++10ee36d012e6ee82febbe0ef2e90381e215afb90