SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f17a8e9acd6f4b9056f412595ffdbaf8e4c5b7ec