SIGN IN SIGN UP

Null merge v3.6.0rc2 tag into mainline 3.6

N
Ned Deily committed
9af1221a00be2b09f1979351e11d36cf4b3c0d6c