SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
0e03d6f2e91ede8e66442086484e76afad1702c0