SIGN IN SIGN UP

Merge from 3.4

A
Andrew Kuchling committed
7f54b2bf710a2d7653090b54f50c2874104653dc