SIGN IN SIGN UP

Merge from 3.2

A
Andrew Svetlov committed
78a0f208cc3e09a084df236b2d1bc8131ae06c17