SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
8c06ac5e5817fc7038c92115035107f9ff6c7a64