Merge trunk with this branch.

FossilOrigin-Name: dd62d2de6eb12dc1902d6df050c395b1dcac01b4

diff --cc manifest
index fb20daadbaaf86ded330fcf9b4cce146c662ebae,fb719999e7b044e470b92df816b1860b25614b35..e4616e5ad08b1b9e9179fa7ae0aaa9f98738943f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Reenable\sthe\sSQLITE_EXPR_REF\soptimization\sfor\s"SELECT\sDISTINCT\s...\sORDER\sBY"\nqueries.
- D 2016-11-11T18:08:59.063
 -C Fix\sa\sproblem\swith\sswitching\sfrom\swal\sto\srollback\smode\swhen\nSQLITE_DBCONFIG_NO_CKPT_ON_CLOSE\sis\sconfigured.
 -D 2016-11-11T17:08:51.459
++C Merge\strunk\swith\sthis\sbranch.
++D 2016-11-11T18:45:55.817
  F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@@ -385,10 -385,10 +385,10 @@@ F src/pragma.h 64c78a648751b9f4f297276c
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
+ F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
 +F src/select.c 04fd717fb99aea2110b752e2b6186b966fa13cb4
- F src/shell.c 63e54cfa1c7ec5b70a4c9a86502bc10280c3d5a3
+ F src/shell.c f04e4af75c5517735397d060ed0b4a874104bb41
  F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@@ -1530,7 -1532,7 +1532,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 0af62fdbd8e2aab14718ff8bcb5934f05463c176
- R dccdf5cb21f8816d64d778a9f6efd1e8
 -P 119d6ef8478ea6ab07dfd0e974d2f5a8dcfce87e
 -R 713cac12bbad56d229ae83741d89e9ae
++P 6e2e9d383f5fc4a0cbf05fe83ec7425812c0f556 46e0016207b8e7df2ae6c7491fd0f3c2926eed21
++R 26a0853ee10a2e1398c5cc3ecf04db09
  U dan
- Z 74767a1cb4eda88af63e605e54888e92
 -Z eb4e3f5ce4749269e2c70de28f3602c7
++Z 0ff63d3cd68908d9e7f9837c3ad40428

diff --cc manifest.uuid
index ee5ae85addc7198e1db8bc6660a8de4615481e58,cdd0440791a537ec106e2fc375134410e47fe39f..ed2e3fd5e64be0fdd5f7e2b39c11312d1fe42119
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6e2e9d383f5fc4a0cbf05fe83ec7425812c0f556
 -46e0016207b8e7df2ae6c7491fd0f3c2926eed21
++dd62d2de6eb12dc1902d6df050c395b1dcac01b4