SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
277b9752609a32d99d968e653d34f92cb03e476c