SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
01121f2d5ab06ae5d4771df7ce7b75e520f4a76c