SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
3f69f02792ee876ed0bd9cf9311bfb510889e164