SIGN IN SIGN UP

Merge with 3.5

Z
Zachary Ware committed
10ea19f69c0bdb2c47aaa29c62dcb1f41825a3dc