SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
4d2aba3ab38b7a9de01aaf821570c2e0bd1aa02a