SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
518cf94ad79503fb16475ccc29592b390e7b19da