SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
c07f3be4e01a7824420622a7355bf40b1685d6bc