SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
c095956ca58b25fe2a4929de538e2eaf1a609852