SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
349c900ed0e3b4b2071e4259d02b5474f7f7a0ec