SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
12aebabd99b2419eaea336b27701107a92fce19d