SIGN IN SIGN UP

Merged from 3.4.

V
Vinay Sajip committed
9f9f0e23a1e68190eb0d9938d16f10fe809daf09