SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
dba1b40b6064107d63f228fe67a258dd1123b189