SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
9409b4aa8f00c227b7157c7149ea3e4c8f1810b5