SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
5922d739d4d0d9ae29a325a752992aff2f2da612