SIGN IN SIGN UP

Merge with 3.2

T
Terry Jan Reedy committed
8d172343ad4d6b79ed076b294dfe963ebdab7c84