SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
98e1b9158ce950e7448ab3860bc556002b8a8e4a