SIGN IN SIGN UP

Merge with 3.2

T
Terry Jan Reedy committed
ca99440c2c0749b73b7a44304186776089b776ba