SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
ae376e5ddc037825cf70adfbefeb2ac05123da52