SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
d40528fe9a27c4656a2b3edeef2b71b3a5afe000