SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
5743691b878b03352f4473d862c656b3de442bcf