SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f07422c0258d0ba6e3887f71f7d726bcde9adb35