SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
339e3f33b6dad76b2622ffd34fc4b0083936fa24