SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
b1c6bdc76a1ac7bc40850f75dbc2dff0b361ee3d