SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
0fd3972a3f8f9fcb9cecd30a608eea02d6b3b18e