SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
86c3a3b0b7b542cc268f7b8812a59a40b7c47e26