SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
4032802eb6ed855fe34fffe4ae2d2c07f6e38c61