SIGN IN SIGN UP

Merge from 3.6.

S
Serhiy Storchaka committed
fc3723bbf6289c9c02f5f8af6f0786230fb66c8d