SIGN IN SIGN UP

Merge from 3.5.0 release branch

S
Steve Dower committed
237060abb4b29a4e43778c115011c279d2779d72