Merge updates from trunk.

FossilOrigin-Name: d8051f611acabc2aaf8d23e8707c2a45961be416

diff --cc manifest
index d97e2d27b9e4000a920d2eb80592ccf2fe9e97a0,eb8d53426379819ae7e8a73a1e087c7962762cd6..af94a1bc30cf411094e6d9f35e77f246191ae127
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
 -C Import\scommon\schanges\sfrom\sthe\smutex\sinitialization\sbranch.
 -D 2015-09-12T18:57:45.818
 +C Merge\supdates\sfrom\strunk.
- D 2015-09-12T16:59:38.586
++D 2015-09-12T18:58:32.998
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1386,7 -1386,7 +1386,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 de3fa51e931d34f341fc3432bfdf97390bb68d4e 86781093bdb4c4fdedd228cb1c8961db48a483bb
 -P 86781093bdb4c4fdedd228cb1c8961db48a483bb
 -R 65cef7a212785e2c4ed01bbc55ee07c1
++P 4859778900a99e7e50ce3d56910ad4c5469f2cdb 334720c01722478af0d3dfd6fe8bafd88ba09f49
 +R cfc16eded5405e1561a759b6078e93d0
  U mistachkin
- Z b4260572fc7350e5188ad004402214d3
 -Z 122b4ea017ab904cde327a85d32df791
++Z 39e49f321343f38df06dd77bd41d446b

diff --cc manifest.uuid
index 213c339c2a6ec92ae16eee086e61ee88dfef4204,62601ecd303d1ba87c25aef1dfcf126879884971..f25e3b36cba50b37e2a75f6be13260af77801141
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4859778900a99e7e50ce3d56910ad4c5469f2cdb
 -334720c01722478af0d3dfd6fe8bafd88ba09f49
++d8051f611acabc2aaf8d23e8707c2a45961be416