SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
e9f72dbf0d857d166626f7fc2713c07a67db1643