SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
7150787b7ebbc1bf42e5da2da25f0b323076cdc1