SIGN IN SIGN UP

Merge 3.4

B
Benjamin Peterson committed
95283fb58951aaa0ee7cfefcbf8785f132819529