SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
3e47a1337c0faa31ee97830f17fa12b850632811