SIGN IN SIGN UP

Issue #5765: Merge from 3.3

N
Nick Coghlan committed
e69bfc3fb6b8f241831d06b0dc9561ce9ac0ef8d