SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
9ee601e197c6f5473a29bd5e8317651ce11f7b89