SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
18d105b824ce55afacf18a9e2a8fee6ea62b2e54