SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f2be8d75acad3f82e8d38299b24b99068b628a6a