SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
87a113b807b308215957f127f3696dca58c08253