SIGN IN SIGN UP

merge 3.5.0b3 changes from 3.5

N
Ned Deily committed
da2d51f97aaf630f5ad13aa004a6c5f0175ef780