SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
e35dc5110f25ab4c43d6d73affc5b212e9be0262