SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411