SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
b0557e729e07e63f36d91d1d631424616373a384