SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
682c979871b42cd21856735c5900f9bee832bfb1