SIGN IN SIGN UP

Merge 3.4

Z
Zachary Ware committed
4ab4ac8e035060956f71fb73feae567a83bc5fbd