SIGN IN SIGN UP

merge 3.1

B
Benjamin Peterson committed
f97aed1a2506539ca612bad9435b1f92b811857d