SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
3acda6e854742fedbe2211685691f5982cdf6700