SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
0b1e4f1427b2cf30de8cae48fe1fd3791e489072