Merge updates from trunk.

FossilOrigin-Name: b8094166b3c6a8ec7913b403e08b5e6790fb03c1

diff --cc manifest
index c7a5b46f3b78a8eb41e7c12c3b2ab31a9167f06c,8e49256d288b6c05d162b8762f544d16573075f8..4bfcc161a3f66017900954fae16d3d697ae6cef2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\ssome\scompilation\sissues.
- D 2016-04-11T22:10:26.085
- F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
 -C Fix\stypo\sin\sthe\sMSVC\smakefile.
 -D 2016-04-11T22:23:04.713
++C Merge\supdates\sfrom\strunk.
++D 2016-04-11T22:24:03.058
+ F Makefile.in eba680121821b8a60940a81454316f47a341487a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
+ F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -326,10 -326,10 +326,10 @@@ F src/build.c 1944d95f0250ec72dab939f83
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
 -F src/date.c 0b73e681c11fca867fec554750c07fe0d4e417c1
 +F src/date.c cd412cb2adb0c3a60e085107864931e508f45ad8
  F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
- F src/delete.c eeac28b3d3d88e3541bdf93e91ea7492a7b67842
- F src/expr.c 289ffac5240b60fee0a824d3d5ab2d7bd2630c94
+ F src/delete.c 78eb999114ec04fcf1b7d123ccedb4b5b734930e
+ F src/expr.c 17d4e745ef6a3fd2e4ef863f5f9a4912f1ba1198
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 4c0bd09e602b8ae8d36d81e31e4872d0b53c87bb
  F src/func.c 552d300265aed09eea21f68ac742a440550c0062
@@@ -359,8 -359,8 +359,8 @@@ F src/os.c ca10edb445ad2c5fdc7285b49d72
  F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
+ F src/os_unix.c bde4844f0849cab5924c6a81178f8500774ce76b
 -F src/os_win.c b3ba9573d8d893e70a6a8015bbee572ecf7ffbef
 +F src/os_win.c 1245c1c1b03f269f8beca1464df2f9a174236dab
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
  F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
  F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
@@@ -1482,7 -1482,7 +1482,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 00990020d07d7c87b922cdbfa5373298a86bb4b3
- R b5c956e1077b7c3e444e8f4ed923bce8
 -P 9efe2265b1e70172778d333c5b9d9a76095427ab
 -R 9dfabe8574d101ebf28b9a702be1975f
++P 016481b39f8b23b4f0f851053068d8eaee6122e1 3189a7f1851f823218d85a2455bf218d00d81543
++R 7558a8a571dae2778f18625aa658ad38
  U mistachkin
- Z 76d8e561edd13c0c75a00b4aec6f1897
 -Z 91af9eba4ad1e404eee70525acb4f1e0
++Z b10810d48122d46da89a3713378b4792

diff --cc manifest.uuid
index 1b336070508fe92f5cd0a054bbed5aac7b77b05f,042db0d78f795d26a60041d266e44b0f4e2222d0..e418fefec5b8b2a08dc2ea852575f69f73248119
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 016481b39f8b23b4f0f851053068d8eaee6122e1
 -3189a7f1851f823218d85a2455bf218d00d81543
++b8094166b3c6a8ec7913b403e08b5e6790fb03c1