SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
4e3dd513966d7cc2e03d97832e2fe22108b31e39