SIGN IN SIGN UP

merge with 3.6

N
Ned Deily committed
96feeab0e2de7b17bf4b286018b5778a66899057