SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
67f7a5ad797e261f23cbdd43e13c57b0f5bec12b