SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
dae2ef1cfad60b149370b4012aa48bea2dd27445