SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
c0654d4e60a534b51db8c6e857d4a671237c2463