SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
d8255e0e9e154c5b9df7d36c1cdf3b67768d3376