SIGN IN SIGN UP

Merge from 3.4

A
Andrew Kuchling committed
42a17fa4fde35f214b18f4cd0f0c69e1117c4b8a