SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
3672c4e21f4a886306070512354443f229c5cd0e