SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
332503db07ab5f8c2dea301a7ec9b8f7d4f1152f