SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e83236f396b39f58e09d012d4a73ccb044f4c350