SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
5901b001244c9ce254f3a00a8a9f8f39747d282f