Merge latest trunk changes with this branch.

FossilOrigin-Name: 6ad0e64b465959c50d4c895c053b15ee7efed11b6427604d2eab88635d9f7319

diff --cc manifest
index bcb5d0daac30944fe58b15cf2783c4d471d2e1e0,3668ff9309cab28ce915887f9937cb2eba9118a7..27358050263305fe6219af8bd699fcc43b45c1e6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Fix\sa\sproblem\scaused\sby\sa\ssub-query\scontaining\sa\swindow\sfunction\sin\sthe\sFROM\nclause\sof\sa\squery\sthat\sitself\suses\sa\swindow\sfunction.
- D 2018-06-19T18:11:05.635
 -C Minor\schange\sto\sthe\sinput\sgrammar\sto\smake\sthe\sparser\stables\sslightly\ssmaller.
 -D 2018-06-19T11:15:19.013
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2018-06-19T19:15:25.540
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
 +F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 681fb88cccf1fd58c0b9648f6a09b75332206ef72ca76012ad11699c320cec5f
 +F Makefile.msc c1646e8f86c30ea63e56176deacef192ac87c663ce2c9083f459c45a7268934f
  F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
  F VERSION d3e3afdec1165a5e593dcdfffd8e0f33a2b0186067eb51a073ef6c4aec34923d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -484,7 -484,7 +484,7 @@@ F src/os_win.c ac29c25cde4cfb4adacc59cd
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
  F src/pager.c 1bb6a57fa0465296a4d6109a1a64610a0e7adde1f3acf3ef539a9d972908ce8f
  F src/pager.h c571b064df842ec8f2e90855dead9acf4cbe0d1b2c05afe0ef0d0145f7fd0388
- F src/parse.y 3b5e69c8a94fc59496fd90b9598bccfc2cee7f7bdce1e17d107a03d51caf1d4a
 -F src/parse.y 4a86c88d1bdd0706bc9b7a24fdf32af45505216767c2434fd0f5866e3effa92f
++F src/parse.y 4350d8b79419158667d564177b47a7612bfc43601cc1da195a1faaf09c9ca3d3
  F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
  F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
@@@ -1743,7 -1731,7 +1743,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 801074ce63d3f4825cc9fa508c42629a9f74e7f9e35c5f238343bb1cff4fbae1
- R 4641575efb36f515d78c6011eec804c4
 -P 39434262d5cf1af197ce0abb1f1ee84ee0797823e290a493c5bf8376fbe287a6
 -R b6cf2872dc6b136d2f9f02df3a45f74e
 -U drh
 -Z ca3608404058acf123d3efb518cfb804
++P f4b1b6f85b53d72e735a1382f7c3de75af405a7878dd8cdcb10394e859ea3d69 320fa69e6aa2a7d67f6444d6c13de9893e27b85c36a933b06da113d753b6aafc
++R 3f551934a344252426be710507621310
 +U dan
- Z 8f9d5637c634d62c951ad6a938d09ca8
++Z d27470b28751518c2f266e1267cc19e0

diff --cc manifest.uuid
index 0adca7c70e5d00b59207d1213b5bff02383f5b4d,dda5fdd11b66ffdab54ea82130cd617e0fbd3830..336c4d5bbc5fe67c81b44bbf864503290e783d07
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f4b1b6f85b53d72e735a1382f7c3de75af405a7878dd8cdcb10394e859ea3d69
 -320fa69e6aa2a7d67f6444d6c13de9893e27b85c36a933b06da113d753b6aafc
++6ad0e64b465959c50d4c895c053b15ee7efed11b6427604d2eab88635d9f7319

diff --cc src/parse.y
Simple merge