SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
b1f1c5ea35816c6010be5be654342186e221739f