SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
eb3849c3947b43803c2dade2dc2064f07c958eed