SIGN IN SIGN UP

merge 3.6

B
Benjamin Peterson committed
e5f2cc67be80961126e9fbf01c80620130fb4817