SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
2bb5aa89d9da5d8f5635f974125c579e22ff8413