SIGN IN SIGN UP

Merge with 3.3

T
Terry Jan Reedy committed
ec53111f76ecba0dacb1a66acca465481303a524