SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e5280feba1db956bd984b9a13a6a5453ec618948