SIGN IN SIGN UP

Issue #3485: merge from 3.4

N
Ned Deily committed
205a55f5c60c50ce9a064432fdf90036690e41a1