SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
8dcaa4b1c6d98797120ce0a96d458f923505418d