SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
b25e3f9e6a1a8ea292335a23eb7dea9d8174efa1