SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
05d7d156266ac561e988ed84d6fbaf044541d855