SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
f88cad00877d4084a89ac7bdbd6d037e9b5d8b98