SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
e706f43225d1b27bd2ece02c97957183ea57afe6