SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
7919acb9202e1b4cf703d54a9346b980f8885a29