Merge fixes from trunk.

FossilOrigin-Name: 662e8ccf7e6cb0c4520f6c572acf10813ce0b20e

diff --cc manifest
index f0dc00bb2b2ea5dd5c73794a2f4e59003bfdee4c,dc0eaa5c63846c6d56380b5617e2363f1a96dced..b1c1df9589d919aff06d96736e05467138128b99
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Increase\sthe\sestimated\scost\sof\ssorting\swhen\ssorting\swide\sresults\ssets,\sto\naccount\sfor\sthe\sextra\sstorage\sspace\sand\sI/O\srequired\sfor\sthe\sexternal\ssort.
- D 2017-02-16T21:29:53.177
 -C Fix\sa\stest\scase\sthat\swas\smade\sto\sfail\sby\sthe\sLIKE\soptimization\senhancement\nin\scheck-in\s[158290c0ab]\sbut\swhich\swent\sunnoticed\sbecause\stest\sbuilds\swere\nrunning\swith\sICU\senabled\sand\sICU\sdisables\sthe\sLIKE\soptimization.
 -D 2017-02-17T02:04:31.068
++C Merge\sfixes\sfrom\strunk.
++D 2017-02-17T02:07:15.678
  F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 067a6766f800cc8d72845ab61f8de4ffe8f3fc99
+ F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1556,10 -1556,7 +1556,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 9fc5cd505fe6ab043519d68e999d2285e22452af
- R 1f872b1c8c31c63af17ddb410f721ab3
- T *branch * increased-sorting-cost
- T *sym-increased-sorting-cost *
- T -sym-trunk *
 -P 8a03be1dc42737ba0712d33f639ea26dc243b20e
 -R b29803fdd4fd514ba7baa53a58b26311
++P aa0703e5cef0c61bec965d4c88ee48bbc11c3649 218b2bbb0de07288889f6762d4461ea8acd78969
++R 31061644eb70eec4652c7f54c3de4a2f
  U drh
- Z a2b62b6254c86979a9aba59b56b00be7
 -Z af65459984ca8c135fabce3c62812860
++Z 016fbe9a5e2938906de76b5256700d32

diff --cc manifest.uuid
index 13f024c476674ee27361b05be0540a68a2ab062a,d642d67abefe8a9ced06b5970aee2ba910946f7f..0d7ac7083f347d775d98cf7a22b2c4e6335478ab
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- aa0703e5cef0c61bec965d4c88ee48bbc11c3649
 -218b2bbb0de07288889f6762d4461ea8acd78969
++662e8ccf7e6cb0c4520f6c572acf10813ce0b20e