SIGN IN SIGN UP

Merge trunk changes into the fts4-incr-merge branch.

FossilOrigin-Name: f61d5fb0281381228eb1a12a233bacaeb26b12a3
D
drh committed
e2392339828a7600a9da5ffd80f6d8162c9f0826