SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
1df78c8e6e03b70a3ad3934355a85b622346087a