SIGN IN SIGN UP

Merge 3.4.0a4 release head back into trunk.

L
Larry Hastings committed
d0a7e678044dc86860cb362f153a2be5976200d9