SIGN IN SIGN UP

Merge from 3.6.

S
Serhiy Storchaka committed
d7d266c11387388bb1abe739e9011f5219861b63