SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
03c59b9bef7ca78dd852d2fad381ee0a0dd17e22