SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
2a7d05a9f2ab15b8e0e5bf024e230748681ec72b