SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
7bbb6e8cf9832195cdf5ef6abb2109011a99174c