SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
b16e12aaaa3d6b3f47dc1400e900c2d4aae0f337