SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
0024fbb5ce336db4603fe56ab819538180192b05