SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
98baa14109322ddae497bc8d823cc0bb1071b445