SIGN IN SIGN UP

Merge with 3.3

A
Andrew Kuchling committed
f567727abcba9d3b56fd2d0254050eff23535d1a