SIGN IN SIGN UP

Merge from 3.5 (with 3.5.0rc2 changes) into default (3.6). Messy!

L
Larry Hastings committed
45d1c0083115b11dff4acbc76232633262f7b1a8