SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
27ee75f1913452d7325a1dac7302d402150639f8