SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
12abc86903d7393c9e8d6c9a3dbc8100dbdee02b