SIGN IN SIGN UP

Merge with 3.5

Z
Zachary Ware committed
e0ffe17e72253429eca94664d5b870f643a2a6dc