SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
4ce9e7a14ac776c61427c2a320e0a0f41f6eb123