SIGN IN SIGN UP

Merge from 3.6.

S
Serhiy Storchaka committed
74a7e3b981265e4f742658b19bdac0818e364920