SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
b5048d3938f8223ea88daeacf64130cde05f9a77