SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
df48b8571ee21ffa2735a292187995d1d77f6484