SIGN IN SIGN UP

Merge from 3.4

T
Tim Golden committed
da5cbe65ae2cf43164ce4ba8e3b47d7b8c15c013