SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
069c87bee45190c52b765c410c008058e32daaa8