SIGN IN SIGN UP

merge 3.5 (#27248)

Patch from Xiang Zhang.
B
Benjamin Peterson committed
c13d85bf8d769bba49c737c326b483b257a997b0