SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
50ff85812f2c0eb488569531a8cfbb56b7f76b0c