SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
161aece9d3574c22d2585687db5cd4f33a76f052