SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
b25d09a15e58a5339d9720a9c99e48a3b144e1d7