SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
199808b796f0b8964796c7279d8e7f11f4b7480b