SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
9beee049b0ff72d684e342a5b77bba4fba2df59b