SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
ac6e57869136e39b0141ce0722099f7fe1476b94