SIGN IN SIGN UP

Merge from 3.4

A
Andrew Kuchling committed
c3a7f181008fef91b5a5977b370271ce3f7f75b0