SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
ec51eb7b2503681a3846f04a22e80fe635e957b6