SIGN IN SIGN UP

merge 3.1

B
Benjamin Peterson committed
48e21fc46f3348c987d671ac4068a03c169ea801