SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e0daa86ce9791de963781f91e92ceb9aeb671909