SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
26e417b1821c2f5d27a81d9733273522b5d21c31