SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
8c6f189964a5e6875d59b519fad941c43c124103