SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
0a9a6363025ba16b1c2041a05e6f33ee408b1bda