SIGN IN SIGN UP

Merge from 3.4

A
Andrew Kuchling committed
6b84335adae7d95b846f31014aeeeb6c533d89d4