SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
42fb352a987050eb042ca8b83d679752e02e1441