SIGN IN SIGN UP

Merge latest trunk changes into this branch.

FossilOrigin-Name: b1533bc455f52f570c0f4b8aaa0da802757dc89b0e45b9a9b31aa591a44bf7bd
D
dan committed
c42a0056d7817f629d78de5d285e2df189ceb10e