SIGN IN SIGN UP

Merge from 3.6.

S
Serhiy Storchaka committed
386072ebe02b54eb9fb303031c769bef094967f5