SIGN IN SIGN UP

Merge 3.6 releasing branch

N
Ned Deily committed
4d80a8a9165bea1acb542c49cc37d32551284f5b