SIGN IN SIGN UP

merge from 3.2 - issue6566

S
Senthil Kumaran committed
8df2634a7ea3fadbea1bdef06bd748ef30b4bb9f