SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
a5f6d0e030e11b84e9e952f6ce688b32f232dda3