SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
ad9f99e41fb7d7e51c8424bb3adba6ad555d0451