SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
3ef2f8c296ec144586fe35babbaf9d644c7ad222