SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
3cbae68de68ecdc5ab9f11836b50b8307768c11c