SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
14017b2a53d790512659e3eca812c96e06ea79c8