SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
41ce610d4ca12ce96aa3a9b9139e416039b18f7b