SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
e19f3ec07228aeaa9bd1379413a3054953a5c51e