SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
29303d4ea5d393edb930e94096bb5ae1d204e618