SIGN IN SIGN UP

Merge from 3.3.

S
Stefan Krah committed
daa96b7669e79882c0e4979902b25a0614a4585a