SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
b5267631cb2a62088ef12b36abd0317957244c6c