SIGN IN SIGN UP

Merge 3.5.2rc1 with current 3.5 branch.

L
Larry Hastings committed
29f963732166260420ffbdebe9eb8b98a009dc8c