SIGN IN SIGN UP

Merge from 3.4

A
Andrew Kuchling committed
19ddaf6d40efd69d7c5292a24a5bd78b5166465a