SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
c09087680eb908406d7331323e92a657182c7b89