SIGN IN SIGN UP

Merge from 3.5

A
Andrew Kuchling committed
bafd4f256069e3ba83fc946bdd7e6698cad32361