SIGN IN SIGN UP

Merge with 3.6

T
Terry Jan Reedy committed
bade830a211ef2986414ba1e60478325aeb0a45c