SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
ec9b7728fe2f9314b2795573c1ffc12fe616900e