SIGN IN SIGN UP

merge 3.1

B
Benjamin Peterson committed
fdb2d909a47dde62ef617bf4c52518325c2c48e7