SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
de8eca46385842a2d5c75ee5a9a8c596735f9c68