SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
364cbb8ca4b9d7c564bf09e0d14dd9f0f77778d6