SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
6ce8d17d02bf1e39265d6c77fe5a851cb38cefd6