SIGN IN SIGN UP

Merge from 3.3

A
Andrew Kuchling committed
46aace343f4b426b79b99157ebe4878fb88bf578