SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
8ec4ae0420f561a997a78d50144ff75ef53424fc