SIGN IN SIGN UP

Merge from 3.6.

S
Serhiy Storchaka committed
4700d86488bc675713802e380ccd9378774d7e92