SIGN IN SIGN UP

merge 3.1

B
Benjamin Peterson committed
c704378987a8347d628b6c0f4c302ecda6d757d0