SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
2deaea31194a8441bf5b7060f65d405c9e0584ce