SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
649e1f141a839c0e90b8ebd940ab08eee62fcfad