SIGN IN SIGN UP

merge 3.1

B
Benjamin Peterson committed
3b59f332b62770f0659fe2cb38b80cc7c7944056