SIGN IN SIGN UP

merge from 3.2. Issue 12359

S
Senthil Kumaran committed
bd4c321a3f7664e22ead9ea8ec55c10c10583905