SIGN IN SIGN UP

Merge from 3.4 into default.

L
Larry Hastings committed
8dc931037b472931f2a96b8525bced6d6d0dc791