SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
3ad880a98aad044119e2d80654e4a641e2504871