SIGN IN SIGN UP

Merge from 3.5

A
Andrew Kuchling committed
9a7aff521e9acfb4cfbccee8c7786d23c21fb269