SIGN IN SIGN UP

merge 3.1 (#12221)

B
Benjamin Peterson committed
0aa71f79821e22c987f86808b0333d57c663728c