SIGN IN SIGN UP

Merge with 3.5

Z
Zachary Ware committed
a31ddb33511f92d20dfddb23d934a0b7f4ab6122