SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
7d74b70e51436a3fab3c3eb35bab6566b60b65eb