SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
53553c4376d709fa33212d190f1ec4fa90233e32