Merge enhancements from trunk.

FossilOrigin-Name: 4b49fe996989fe42d2bb1c24e7193fef09c5fc50

diff --cc main.mk
Simple merge

diff --cc manifest
index 2777d3602178caf2fd35c998c09c791d68789a9c,a5189ddba40af258c46fd24fc4f263a43b0876f2..b7ec71865dcf60ef23ad9370a1ff69821c6345fb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\sdocumentation\sfor\sfts5\ssynonym\ssupport.
- D 2015-09-03T18:05:09.505
 -C A\ssimple\soptimization\sand\ssize\sreduction\sin\ssqlite3PagerAcquire().
 -D 2015-09-03T18:20:10.962
++C Merge\senhancements\sfrom\strunk.
++D 2015-09-03T18:57:52.309
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e2218eb228374422969de7b1680eda6864affcef
+ F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
+ F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -260,7 -258,7 +260,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 8a8468564b2e387116614fcda2a6d4f5f754b955
 -F main.mk 8da13ed011a7ae19450b7554910ff4afa3bd22b7
++F main.mk 61821e43596648bfacce2d6283377bee35986131
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -1382,7 -1380,7 +1382,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 89f24f31a8f7d7cb0a66ee53523881f566dcb035
- R 763079caf8ff69ca16b541c2d3f4f0ad
 -P b79096be7cb02aae2f303db33a8bf19e69204374
 -R d1173d7149bc899e819d5c3a3bb552ec
 -U drh
 -Z 442809bedf9761a63ee7744b080363fa
++P 58aa1f435959852df74f1bca8e0bdbc4f47c256a 618d8dd4ff44cce10cc4688a2134715ff66cc562
++R 38e68c75949f5efa3d52c01a80d7f0aa
 +U dan
- Z 726cf8268b191707cc8a3f300ac29036
++Z 9f85937304cd0ef1147cd11d7113913e

diff --cc manifest.uuid
index fc803bdc2cd69a9f67257008f010a1838f998472,67e347a34688dc7dd4e19fd4ce7fda6c88052e73..d9cd6ed6807cc7890c6950dddcaff2b7a3e6e37b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 58aa1f435959852df74f1bca8e0bdbc4f47c256a
 -618d8dd4ff44cce10cc4688a2134715ff66cc562
++4b49fe996989fe42d2bb1c24e7193fef09c5fc50