SIGN IN SIGN UP

Merge latest trunk changes into this branch.

FossilOrigin-Name: 373fa21bffd37053bb1a741d3ace2f003a5639bf373c20ea7bb24a31080888b3
D
dan committed
3d9c7c3a4f5854770cf834f4d53d4c76be35696e