SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
4785f5e24930fa1cb9072c59d2963d148620127d