SIGN IN SIGN UP

Merge 3.4

B
Benjamin Peterson committed
44f323cb42418e6e2b83b7655146de66a7289dd4