SIGN IN SIGN UP

merge 3.6

B
Benjamin Peterson committed
510df6f2721bd6ed69716938c45cea03b2b84c99