SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
a5f3ad8c05c115266834be8716c19301004a31a0