SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
d52513cb222174df834ea81e61037899248e312c