SIGN IN SIGN UP

Merge with 3.2

T
Terry Jan Reedy committed
3380170ea5c29c8b823dcdf3c0f77f168f6998e4