SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
869b1f907034e2d0299b45362ed0dc30269269ee