SIGN IN SIGN UP

merge 3.1

B
Benjamin Peterson committed
c9c8d0edd6daaba167527d6e659fe95715042b7e