SIGN IN SIGN UP

Merged upstream changes.

V
Vinay Sajip committed
484adb509ee78b7e9a0b0374235bb4bf0a3e3aa9