SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
52074ac866eb2220a261210a2db5e41dc0bc27df