SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
c7e0522d42af4611965f770f849c2442cee37178