SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
f8eb15dce2228eacfe44d908d77b6518c72196e9