SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
57bda335e1ec1e5dfa7972ad118f0a1e5f539ec6