SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
d7483993fea2862f750526cbb94a4a32f6dfad9c