SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
abf22b405fb15835ac9e1a732dee624c1a6c805a