SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
951138c79580f0d32d3aace10901f9c2387bd846