SIGN IN SIGN UP

Merge from 3.4.2 release head back into 3.4 mainline.

L
Larry Hastings committed
2ce95d7b7c6252a720a7174ea837f88092ff35f1