SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
5094eee2760c821bea041667dd99e5ce5309aca3