SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
0b2a6dc42b9bf02408764133a8dfcd843bbd0e66