SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e44b947a9df1939c7cabd54bc20fe2b2027d04ac