SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e3e8b07bcbb12cb09519495700fdbe3e4c9b9836