SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
3468d25a80b6d080b2a90d596ba4c3f6c2618d39